Resolve Git Merge Conflicts

# Start a merge that may have conflicts
git merge feature/new-feature

# Check which files have conflicts
git status

# Conflict markers in files look like:
# <<<<<<< HEAD
# your changes
# =======
# incoming changes
# >>>>>>> feature/new-feature

# After manually resolving conflicts in your editor:
git add resolved-file.ts

# Complete the merge
git commit

# Abort the merge and go back to pre-merge state
git merge --abort

# Accept all incoming changes for a file
git checkout --theirs path/to/file.ts
git add path/to/file.ts

# Keep your version of a file
git checkout --ours path/to/file.ts
git add path/to/file.ts

# Use a merge tool
git mergetool

# View the base, ours, and theirs versions
git show :1:file.ts  # base
git show :2:file.ts  # ours
git show :3:file.ts  # theirs