git-conflict.md

Git Conflict

Back

# During merge
# To checkout your own version 
git checkout --ours -- <filename>

# To checkout their version
git checkout --theirs -- <filename>

# During rebase
# To checkout your own version 
git checkout --theirs -- <filename>

# To checkout their version
git checkout --ours -- <filename>