🔀 Merge Conflict Resolution = Git Mastery
Merge conflicts are inevitable. Mastering conflict resolution makes you a Git expert and keeps your team’s workflow smooth.
📝 Conflict Resolution Workflow
# 1. Identify Conflicting Files git status # both modified: src/App.js # 2. View Conflict Details git diff git diff --name-only --diff-filter=U # 3. Resolve Manually # Open file, look for: <<<<<<< HEAD // Your changes const user = getUserById(id); ======= // Incoming changes const user = await getUserById(id); >>>>>>> feature-branch # 4. Mark as Resolved git add src/App.js # 5. Commit Merge git commit -m "Resolved merge conflicts" # 6. Alternative: Abort git merge --abort # 7. Use --theirs or --ours git checkout --theirs src/App.js git checkout --ours src/App.js
🎯 Advanced Tools
# Visual Merge Tools git config --global merge.tool vscode git config --global mergetool.vscode.cmd 'code --wait $MERGED' # Use mergetool git mergetool # Three-Way Merge git merge --no-ff --no-commit feature-branch # Rebase Instead git checkout feature-branch git rebase main git rebase --continue git rebase --abort # Interactive Rebase git rebase -i HEAD~5 # Cherry-pick Specific Commits git checkout main git cherry-pick abc123 # Stash Before Merging git stash save "WIP before merge" git pull origin main git stash pop
💡 Conflict Prevention Tips
- Pull and merge frequently
- Communicate about overlapping work
- Keep branches short-lived
- Use feature flags
- Review code with conflict resolution in mind
“Merge conflicts are not failures—they’re opportunities to improve collaboration. With the right tools, conflicts can be resolved quickly.”
Related posts:

Git: Fix git log --follow That Silently Loses a File's History After a Rename Git Didn't Detect

Git: Fix git log Missing Commits You Know Exist Because a Shallow Clone's --depth Cut the History Sh...
