how to fix this kind of git conflict: .merge_file_a
16196
How to resolve merge conflicts in Git repository?
52589
Mercurial: Merging one file between branches in one repo
75936
How to make git mark a deleted and a new file as a file move?
42987
How do I merge my local uncommitted changes into another Git branch?
31154
How do I work with a git repository within another repository?
20528
Where did folder "merge" or "keep both" go in OS X 10.9 Mavericks?
16239
How do I make a Git commit in the past?
7088
How to make git ignore changes in case?
42569
Is there anyway to undo git push -f?
74671
How to make Git ignore changes I'm making to a file (under source control)?
136317
git working on two branches simultaneously
45630
Combining multiple git repositories
74814
Is there a "theirs" version of "git merge -s ours"?
44339
How do I tell git to always select my local version for conflicted merges on a specific file?
86602
How to get mercurial to emit base revision of conflicted file as well as modified version?
85044
git creates files ending in ~?
51344
What does it mean when Git says 'rewrite' or 'rename' in a commit message?