Way to force merge/rebase conflict on a specific file
32189
Git - how to force merge conflict and manual merge on selected file
30687
Any way to sync directory structure when the files are already on both sides?
33180
How can I merge files on a line by line basis?
116412
is it possible to add a comment to a diff file (unified)?
105754
Is there a way to tell make to apply a rule to every file that matches a pattern?
5168
How to force delete a file?
35639
Change Eclipse settings to ignore errors on a specific file
72794
How do you revert a faulty git merge commit
41252
How do I make Git use the editor of my choice for commits?
113644
How to break a maven build when there is a dependency conflict?
85726
What is the easiest way to merge / and /home?
147234
Add all files to a commit except a single file?
125406
Use Closure Compiler Command Line Minify and Replace Original File
149297
What are typical use cases of git-reset's --merge and --keep flags?
48984
Combine or rebase an arbitrarily large number of commits
68159
Is there a way to make Git mark a file as conflicted?
127374
How can I balance uniformity of style files against modularity?