How to get the list of unstaged files during git-merge?
Git: mark two commits on two branches as same though history of commits on the two is different
Why do I get a merge conflict?
How do I merge a branch into a master in github?
Git merge - Conflict markers missing
Git folder merge between branches
Results of Merging a Branch Tracking a Remote with a Branch Containing a Submodule?
Git merge: Re-check conflict resolution in files before commit
How do I merge a git tag onto a branch
How to check mergeability of a branches using the github api
Merging two repositories with the github API
Checkout and merge a file from other branch in git
error: The following untracked working tree files would be overwritten by merge:
How do I configure Araxis Merge for use with Git?
How to set Meld as git mergetool
Working with GIt without branches