Share
ReportI am using Github to work in parallel with other colleagues. We had to do a restore since some data was lost so I went in github desktop and 'Revert the commit'. We got a message about conflict files and we pushed it like this.
Now we can't open the app in edit mode due to error below:
From what i see in history, there are 2 files that keep popping up as conflicts as I was thinking to undo my undo but I get an error about unmerged files :
So how can we fix this? ideally we want to restore a previous version and avoid this conflict issues.
Categories:
I have the same question (0)
All responses (
Answers (
379
