/* Code Comments */2 posts tagged with "recursive"
git merge strategies - recursive - theirs (and ours)
2020-12-02
|~1 min read
|184 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…
git merge strategies - recursive - theirs (and ours)
2020-12-02
|~1 min read
|184 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…