Merge
Chester Wyke April 17, 2023 Updated: April 23, 2026 #GitAborting a merge
It is sometimes possible to abort a merge for example if there is a conflict and the merge is not completed.
git merge --abortMerge conflicts
Taking all of one side
WARNING: This literally just takes all of one side it’s not selective.
Note: If you are unclear what theirs and ours refers to it’s best to consult the docs before issuing any commands.
Old approach
I am keeping this version for reference but I no longer think it’s a good approach because it is not exactly what I think of as take theirs.
It will for example give errors for files that exist in ours but not in theirs, which kinda isn’t what I want.
If you are already in the merging state and have conflicts and want to take all of ours or theirs you can use one of following.
git checkout --theirs .If you want to do the opposite:
git checkout --ours .You can mark all the conflicts resolved after by using git add . or git add -u to only stage tracked files.
When issuing the checkout command specify if you want ours or theirs.
git merge -X theirs <branch-name>