SourceTree pull added code to files: <<<<<< .merge-file_a07112

I'm trying to understand the process of integrating changes from my Bitbucket-based repository into a repository on my laptop.  I did a push from a desktop system to my origin repository on Bitbucket and that went well.  Now when I do a pull on the laptop from the origin repository on Bitbucket, I have two conflicting files.  The files have had code added in several places indicating '>>>>>>> .merge-file_a02536' and '<<<<<<< .merge-file_a07112'.  These additions to the code have been saved on the laptop even though the commit is being stopped due to a conflict.  I'm unsure as how to proceed.  How can I remove these added lines and perform the commit?

Thanks,

Rick R.

1 answer

This widget could not be displayed.

Those are the flags identifying the merge conflicts. You need to use third party software to resolve the conflicts to make those extra notations go away properly. You can find many recommendations for multiple operating systems in the stackoverflow question:

http://stackoverflow.com/questions/137102/whats-the-best-visual-merge-tool-for-git

To add to this, you can resolve the merge yourself in SourceTree, but only by picking 'mine' or 'theirs'. If you need more granular control (which is likely) then do what Seth says :)

Suggest an answer

Log in or Sign up to answer
Atlassian Summit 2018

Meet the community IRL

Atlassian Summit is an excellent opportunity for in-person support, training, and networking.

Learn more
Community showcase
Published May 30, 2018 in Sourcetree

Tip from the team: configuring Git or Mercurial in Sourcetree

Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...

712 views 1 3
Read article

Atlassian User Groups

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

Find a group

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

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you