Git Apprentice, Chapter 10: Merging | Kodeco, the new raywenderlich.com
How to have a file that is branch-specific, so it doesn't get overwritten when merging? : r/git
git merge ours - DEV Community
EGit/New and Noteworthy/5.12 - Eclipsepedia
An introduction to Git merge and rebase: what they are, and how to use them
Merge Strategies in Git - GeeksforGeeks
Git Made Simple
7. Merging - Git Pocket Guide [Book]
Git Rebase vs. Git Merge Explained
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