git merge file with conflict
16196
How to resolve merge conflicts in Git repository?
61412
Using latexdiff with git
25070
Squash my last X commits together using Git
53750
How to backup files in multiple directories with git?
92403
How to ignore certain files in Git
9079
Mark-as-duplicate vs. Merge
13861
Change merge shortcut?
74814
Is there a "theirs" version of "git merge -s ours"?
104395
How do I undo 'git add' before commit?
102016
git commit -a confusion
122314
How to undo "git commit --amend" done instead of "git commit"
74449
How can I selectively merge or pick changes from another branch in Git?
37226
Two git repositories in one directory?
33180
How can I merge files on a line by line basis?
100431
How to complete a git clone for a big project on an unstable connection?
16239
How do I make a Git commit in the past?
157157
How can I cut down a git bisect run using file paths?