Resolving Conflicts

Whenever Git fails to do a merge or apply a patch, it will put your tree in a state of conflict.

You can escape from conflicts using the reset command, but then you won't be able to do the merge or apply the patch.

To address the conflict, you must do the following:

• Edit each file with a conflict, fixing the conflicting parts so that they are in the correct "new" state.
• Use the git add command to add each edited file to the index.
• Follow the instructions git gave you to continue. Usually this means running git commit or git rebase --continue.

During this process, Git gives you a lot of information to make this task easier. Unfortunately, to the untrained eye, what Git tells you will look like gibberish.

Because merging and applying a single patch are different processes, the resulting conflicts need to be understood differently.