?? Post 3 - Resolving Merge Conflicts Like a Pro

? Merge conflicts happen when Git can't automatically merge changes. Don't panic—resolving them is easy!

?? Why do conflicts happen?

Conflicts usually occur when:

? Two people change the same file in different ways

? A branch modifies a file that has changed in main

?? Simulating a Merge Conflict

Try this:

1?? Create a branch and modify a file:

git branch conflict-demo
git switch conflict-demo
echo "This is a change in conflict-demo" > conflict.txt
git add conflict.txt && git commit -m "Change in conflict-demo"        

2?? Switch back to main and modify the same file:

git switch main
echo "This is a change in main" > conflict.txt
git add conflict.txt && git commit -m "Change in main"        

3?? Now, try merging conflict-demo:

git merge conflict-demo        

You’ll see something like:

CONFLICT (content): Merge conflict in conflict.txt        

?? Resolving the Conflict

1?? Open the file and choose which version to keep.

2?? After fixing, mark the conflict as resolved:

git add conflict.txt
git commit -m "Resolve conflict in conflict.txt"        

?? Next post: How to write better commit messages and improve your Git history!

?? What’s the worst merge conflict you’ve faced?