Which Git merge strategy is appropriate for our team?
Git Apprentice, Chapter 10: Merging | Kodeco, the new raywenderlich.com
Git: Ours or Theirs? (Part 1) Tips for resolving conflicts automatically | The Miners
Git - Advanced Merging
Have a messy #gitmerge, but know that one branch is ahead of the other and it should override the other? Use the merge -X strategy-option… | Git, Linux, Preferences