git-merge

208 Questions
Newest Active Unanswered Frequent
Score
View
Card Compact
Git merge flattening
user_843990
•
44
3
43046
git-merge git-push git-pull git
Is there a git-merge --dry-run option?
Otto_95940
•
928
20
265000
git-merge git
Git workflow and rebase vs merge questions
Micah_199640
•
1028
11
221874
git-rebase git-merge version-control git
How can I selectively merge or pick changes from another branch in Git?
David_Joyner_11460
•
1696
28
975521
git-cherry-pick git-patch git-merge git
When would you use the different git merge strategies?
Otto_95940
•
457
4
144608
git-merge merge git
Is there a "theirs" version of "git merge -s ours"?
elmarco_12775100
•
1057
18
612081
git-merge git
How do I resolve merge conflicts in a Git repository?
user_37130
•
5242
36
3274561
git-merge-conflict merge-conflict-resolution git-merge git
I ran into a merge conflict. How do I abort the merge?
user_186660
•
3049
14
2374164
git-merge-conflict git-merge version-control git
Hot Questions