Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

How to undo an attempted conflicting merge

kalebeberhart February 5, 2020

I'm working in Unity and there was an instance where the same scene was accidentally worked on by 2 people and their files are essentially binary or so large I don't know how to locate the merge conflicts in a text editor. I made and pushed a commit to the master while he was working on the level and he attempted to push shortly after. There is a conflict and I'm trying to reset the origin back to the highlighted commit but even resetting the branch to this commit has been unsuccessful. The problem is that as soon as this gets checked out it requires me to pull again but I'm still getting my bearings around Git and Sourcetree so I'm not quite sure how to proceed. Also it's ok in this instance if we lose the work done in the commit scribbled out in the second picture.what I have.pngWhat I want.png

0 answers

Suggest an answer

Log in or Sign up to answer
AUG Leaders

Atlassian Community Events