If the change that you submitted has a merge conflict, you need to manually resolve it using git rebase.
Rebasing is used to integrate changes from one branch into another to resolve conflicts when multiple commits happen on the same file.
WarningNever do a rebase on public (master) branches.
You submit a change.
Somebody else submits a change and that change merges. Now your change has a merge conflict.
Resolve conflicts manually:
Conflicts are marked in a file with clear line breaks:
<<<<<<< HEAD
Second line.
=======
Third line.
>>>>>>> feature/topic branch.
<<<<<<<: Indicates the start of the lines that had a merge conflict.
=======: Indicates separation of the two conflicting changes.
>>>>>>>: Indicates the end of the lines that had a merge conflict.
You need to resolve a conflict by manually editing the file. You also need to delete the ‘<<<<<<<’, ‘=======’, and’>>>>>>>’ in the file.