Merge Conflict : while pulling a single file from a branch
99229
How do I copy a version of a single file from one Git branch to another?
115773
"selectively" merging with git
38980
Removing multiple files from a Git repo that have already been deleted from disk
8982
Can I recover a branch after its deletion in Git?
13861
Change merge shortcut?
136317
git working on two branches simultaneously
44803
Merging updated code from parallel Subversion repository
19958
Modified files in a git branch are spilling over into another branch
119711
Git workflow and rebase vs merge questions
157157
How can I cut down a git bisect run using file paths?
153352
What's the simplest way to list conflicted files in Git?
72690
Can git ignore a specific line?
90857
How to cancel a pull request on github?
86602
How to get mercurial to emit base revision of conflicted file as well as modified version?
15543
git merge: Removing files I want to keep!
101443
Why do I have to stash / commit my changes before switching branches?
68159
Is there a way to make Git mark a file as conflicted?