List Question
10 TechQA 2015-06-09 13:27:31How to determine if Git merge is in process
20.5k views
Asked by pathfinderelite
How to list merge conflicts on origin that are not on local?
251 views
Asked by Robert Kerr
Feature branch with or without fast-forward merge?
2.9k views
Asked by boop
merge master into subtree branches
331 views
Asked by Nico Schlömer
GIT HOOK to check keyword "PROMOTE" in message when GIT MERGE is executed
450 views
Asked by Pavan Sokke Nagaraj
hint: after resolving the conflicts, mark the corrected paths
58.2k views
Asked by paullb
git auto-merge does not work as expected
1.8k views
Asked by trk
Git: Merging very large master branch with a feature branch
319 views
Asked by Jason Maskell
Include (realign) some branch changes into other branch
207 views
Asked by padibro
Git - coworker somehow overwrote my entire commit while resolving a conflict
322 views
Asked by user3779812