Automatically fix a minor merge conflict
74814
Is there a "theirs" version of "git merge -s ours"?
112972
Are there any tools for merging CSS?
113644
How to break a maven build when there is a dependency conflict?
16500
How do you merge two Git repositories?
23196
Merge files using zipper method / late merge
72794
How do you revert a faulty git merge commit
153576
Option Clash for Hyperref Package
138506
Automate fixes for issues found by Sonar
147015
Resolving MSB3247 - Found conflicts between different versions of the same dependent assembly
105965
How can I merge two unallocated spaces?
11871
How to modify existing, unpushed commit messages?
48984
Combine or rebase an arbitrarily large number of commits
1714
Fixing software center catalog
53230
How do I discard unstaged changes in Git?
112173
When would you use the different git merge strategies?
94501
How do I reduce the size of a bloated Git repo by non-interactively squashing all commits except for the most recent ones?
98277
Obsolete flag handled automatically?