How to fix CONFLICT (content): Merge conflict in file.txt Automatic merge failed; fix conflicts and then commit the result in Git

# Show the current status with conflict information
git status

# You'll see output like:
# On branch main
# You have unmerged paths.
#   (fix conflicts and run "git commit")
#   (use "git merge --abort" to abort the merge)
#
# Unmerged paths:
#   both modified:   file.txt
#   both modified:   src/component.js

# List only conflicted files
git diff --name-only --diff-filter=U

<<<<<<< HEAD
This is the content from your current branch (HEAD)
=======
This is the content from the branch being merged
>>>>>>> feature-branch

git config merge.conflictstyle diff3

<<<<<<< HEAD
Your changes
||||||| merged common ancestor
Original content before both changes
=======
Their changes
>>>>>>> feature-branch

This is the content from your current branch (HEAD)

This is the content from the branch being merged

Combined content from both branches

# Search for any remaining conflict markers
grep -rn "<<<<<<" .
grep -rn "=======" .
grep -rn ">>>>>>" .

# Stage the resolved files
git add file.txt
git add src/component.js

# Or stage all resolved files at once
git add .

# Verify the resolution
git status
# Should show: "All conflicts fixed but you are still merging"

# Complete the merge with a commit
git commit
# Git will open your editor with a default merge commit message
# You can modify it or save as-is

git commit -m "Merge feature-branch into main, resolved conflicts in file.txt"

# Launch the configured merge tool
git mergetool

# Git will open each conflicted file in your merge tool
# Resolve conflicts visually, save, and close

# Set your preferred merge tool
git config --global merge.tool vscode
git config --global mergetool.vscode.cmd 'code --wait $MERGED'

# Other popular options:
git config --global merge.tool meld
git config --global merge.tool kdiff3
git config --global merge.tool vimdiff

git config --global mergetool.keepBackup false

# Or delete manually
find . -name "*.orig" -delete

# Accept all changes from the current branch (ours)
git merge -X ours feature-branch

# Accept all changes from the incoming branch (theirs)
git merge -X theirs feature-branch

# Keep the current branch's version of a file
git checkout --ours file.txt
git add file.txt

# Keep the incoming branch's version of a file
git checkout --theirs file.txt
git add file.txt

# Abort the merge and restore pre-merge state
git merge --abort

# Update your branch first, then try again
git pull origin main
git merge feature-branch

# Or rebase instead of merge
git rebase main

# Undo the merge commit
git reset --hard HEAD~1