Welcome to LeviFREE's Blog

1. First Determine: Are You Merging or Rebasing?#

Command:

1
git status

If it says rebase in progress, the handling method is different from a merge.

2. Three Principles Before Handling Conflicts#

1. Ensure the code semantics are correct first, then pursue a clean history.
2. Do not make extra requirement changes during the conflict resolution phase.
3. Resolve one small chunk at a time, and run tests promptly.

3. Merge Conflict Handling Process#

1
git pull origin main
2
# After conflicts appear, edit the conflicting files
3
# Delete the <<<<<<< ======= >>>>>>> markers
4

5
git add <resolved-files>
6
git commit

4. Rebase Conflict Handling Process#

1
git fetch origin
2
git rebase origin/main
3
# Fix conflicts
4

5
git add <resolved-files>
6
git rebase --continue

If you realize your rebase route is wrong:

1
git rebase --abort

5. The 5 Most Common Types of Conflicts#

1. The exact same line modified by both sides simultaneously.
2. File renaming occurring simultaneously with content modification.
3. Conflicting file deletion vs. file editing.
4. Frequent conflicts in lock files (e.g., package-lock.json).
5. Automatic formatting tools causing massive meaningless diffs.

6. Practical Tips#

• git diff --name-only --diff-filter=U: Only show conflicting files.
• Resolve core business files first, then handle configuration or formatting files.
• Try to resolve lock file conflicts by regenerating them, avoid manually editing complex sections.

7. Post-Conflict Regression Check#

Execute at least the following:

1. Project build.
2. Core test cases.
3. Manual smoke testing of critical pages.

This step cannot be skipped, otherwise, “the conflict is resolved, but the feature is broken.”

8. Prevention at the Team Level#

• Small, frequent commits to reduce massive PRs.
• Sync long-running branches with upstream daily.
• Run CI before merging.
• Unify formatter and lint rules.

Summary#

Conflict resolution is not a technical dilemma, but an engineering discipline issue. With established processes, boundaries, and regression checks, conflicts will no longer be a black hole for team efficiency.