Home About Notes

Git merge strategy

Mar 02, 2023

I've known this is a thing but I forget the syntax since I use it rarely. 

git merge --strategy-option theirs
# or
git merge --strategy-option ours

If dont want to review conflicts and just apply a resolution strategy you can use the above.