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
Which Git merge strategy is appropriate for our team?
Which Git merge strategy is appropriate for our team?
How to have a file that is branch-specific, so it doesn't get overwritten when merging? : r/git
Merge conflicts: "use ours" "use theris" buttons are not available for binary files. · Issue #624 · gitahead/gitahead · GitHub