Merge conflict when modifying a branch
16196
How to resolve merge conflicts in Git repository?
158861
Can "git pull --all" update all my local branches?
79315
How to amend a commit without changing commit message (reusing the previous one)?
48335
Using git to identify all modified functions in a revision
505
Rename master branch for both local and remote Git repositories
153576
Option Clash for Hyperref Package
106905
Merge, update, and pull Git branches without using checkouts
153352
What's the simplest way to list conflicted files in Git?
149297
What are typical use cases of git-reset's --merge and --keep flags?
105438
How do I find the merge that moved my changeset to another branch?
116902
Why is "origin/HEAD" shown when running "git branch -r"?
158135
How to generally match, unify and merge patterns?
53230
How do I discard unstaged changes in Git?
56435
Can I easily update all local git branches from remote branches simultaneously?
115487
Git merge reports "Already up-to-date" though there is a difference
63011
Git merge left HEAD marks in my files
35976
Undoing a git rebase