/* Code Comments */1 post tagged with "recursive"
git merge strategies - recursive - theirs (and ours)
2022-11-28
|~1 min read
|180 words
Often when I get a merge conflict, what I really want to do is defer to the master branch, so, if I’m on a branch and I want to merge in the…