How to preview merge conflicts?
90720
Is there a git-merge --dry-run option?
74118
Fixing the sucktastic merge UI (for tags)
108564
How to make unit selection circles merge?
112173
When would you use the different git merge strategies?
147015
Resolving MSB3247 - Found conflicts between different versions of the same dependent assembly
14625
Using AutoMerge Editing - things aren't merging, what isn't right?
68159
Is there a way to make Git mark a file as conflicted?
115773
"selectively" merging with git
38268
How to fix "Duplicate sources.list entry" warning?
16500
How do you merge two Git repositories?
120866
Option clash when using graphicx and tikz packages
154499
Naming conflicts with Dummy variables in several packages conflicts
1860
How to disable the "highlight changes" feature?
99720
QGIS 2.4.0: dissolve tool renders artifacts / errors
44803
Merging updated code from parallel Subversion repository
37044
Apple Preview Program messed up the shortcuts after the Yosemite update
153352
What's the simplest way to list conflicted files in Git?