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

Merge Issue with invalid characters

Kesab Nandi September 5, 2023

Whenever we do pull the origin again the files in local checked out folder gets corrupted with less than and greater than signs.

1 answer

1 vote
Theodora Boudale
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
September 6, 2023

Hi Kesab,

Do these signs look something like this?

<<<<<<< HEAD
this is some content
content to append
totally different content to merge later
>>>>>>> feature_branch

If so, these are not signs of a corrupted file, but conflict markers coming from Git.

If you change the same part of the same file differently in the two branches you’re merging, Git won't be able to merge them because it won't know which version to keep.

The content between the <<<<<<< HEAD line and ======= is content that exists in the current branch which the HEAD ref is pointing to. The content between ======= and >>>>>>> feature_branch is content that is present in the merging branch.

If there are conflicts, you need to resolve them manually by editing the file and committing the changes.

You can read more details on the following page of the Git book, section Basic Merge Conflicts:

You can also check our documentation page on how to resolve merge conflicts:

Please feel free to reach out if you have any questions.

Kind regards,

Suggest an answer

Log in or Sign up to answer
AUG Leaders

Atlassian Community Events