It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

How to undo an attempted conflicting merge

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
TAGS
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

3,091 views 0 10
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you