How to resolve a merge conflict in Git?

When encountering Git merge conflicts, you must first understand the causes of the conflict and follow the steps step by step. 1. Conflicts usually occur when two branches modify the same part of the same file. 2. Use git status to view files marked "both modified" to identify conflicting files. 3. After opening these files, find the content between the >>>>>>>>>> tags for manual editing. 4. Delete unwanted parts or integrate the two parts and save them. 5. Use git add file name to add the modified file to the temporary storage area. 6. Run git commit to complete the merge. It is recommended to confirm the change intention before resolving, communicate with collaborators to confirm the retained part, and use graphical tools to compare the differences to avoid processing too many conflicting files at once.

Don't panic when encountering Git merge conflicts. In fact, it is not complicated to solve. The key is to understand the causes of conflicts and handle them step by step.

What is a merge conflict?

Git merge conflicts usually occur when two branches modify the same part of the same file. Git cannot automatically determine which side of the changes to retain. At this time, you need to intervene manually to decide which codes should be retained and which need to be discarded or integrated.

Common scenarios include multi-person collaborative development, pulling remote updates (such as git pull ), or merging local branches (such as git merge ).

How to identify conflicting files?

When you perform a merge operation, Git will prompt for conflicting files. You can view it in the following ways:

• Use git status to view files marked "both modified".
• After opening these files, you will see something like the following:

 <<<<<<<<< HEAD
This is the content of the current branch================
This is a change to merge in>>>>>>>>> feature-branch

These three paragraphs are where conflict occurs. You need to manually edit these areas, choose which part to keep, or integrate.

How to resolve conflicts manually?

1. Open the conflict file and find the content between the , <code>======= , and tags.
2. Delete the unwanted parts and keep the code you want. You can also keep both parts and integrate them.
3. Save the modified file .
4. The tag conflict has been resolved : Use git add 文件名to add the modified file to the temporary storage area.
5. Submit the final result : Run git commit to complete the merge.

For example, if both of you add different logic to the same function, you have to see which parts must be preserved, or whether they can be merged into a complete version.

Some practical suggestions

• Before resolving the conflict, first confirm that you are clear about the changes in the two branches.
• If you are not sure how to choose, you can communicate and confirm with the collaborator before deciding which part to retain.
• Using graphical tools (such as VS Code, Sourcetree) can help to compare differences more intuitively.
• Avoid conflicts of too many files at once, and it is easier to clarify your ideas by dealing with them one by one.

Basically that's it. Merger conflicts may seem scary, but they can be easily solved by just taking them step by step.

The above is the detailed content of How to resolve a merge conflict in Git?. For more information, please follow other related articles on the PHP Chinese website!