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 disable <<<<<<< HEAD message when merging from the code.

Also, what does that message mean? <<<<<<< HEAD and some number 1280930129839asdf

1 answer

That message tells you where the conflicts exist after you tried to merge two versions of a file, when git couldn't figure it out itself how to properly merge the changes. Shortly, git couldn't merge the changes automatically, so it wrote markers at those places (where changes couldn't be automatically merged) for you to look at it and fix it manually.

You can read this article, to get a better understanding of that: http://genomewiki.ucsc.edu/index.php/Resolving_merge_conflicts_in_Git

For example, if you have a merge conflict and you ended up with something like this:

&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD:mergetest
 This is my third line
 =======
 This is a fourth line I am adding
 &gt;&gt;&gt;&gt;&gt;&gt;&gt; 4e2b407f501b68f8588aa645acafffa0224b9b78:mergetest

you will edit that text and make it look something like this:

This is a correct text now and it should have been here if the git could merge the files successfully.

So, you'll replace that entire block with a valid text, that should stay there (also removing those markers that start with "<<<<<<<", "=======" and ">>>>>>>").

Suggest an answer

Log in or Sign up to answer
This widget could not be displayed.
This widget could not be displayed.
Community showcase
Posted Jan 17, 2019 in Sourcetree

[dev team] Sourcetree for Windows 2019 Preview - Dark Theme

Hi folks, While the full post is over on our blog I'd like to share the dark theme we've got planned for 2019 here directly as well to keep the discussion going.  The ...

1,431 views 13 14
Join discussion

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