git-merge-conflict

54 Questions
Newest Active Unanswered Frequent
Score
View
Card Compact
Is it possible to merge after cherry-pick and rebase?
user_80249260
•
4
1
139
git-cherry-pick git-merge-conflict git-rebase git-merge git
How can I see what "previous resolution" git applied?
user_18889830
•
2
0
284
git-rerere git-merge-conflict merge-conflict-resolution git
How to see three-way git diff even after conflicts are resolved
user_9976060
•
3
1
755
git-merge-conflict git-rebase git
Gerrit UI showing status as merge conflict even when there is no conflict
user_40686900
•
4
2
2175
gerrit git-merge-conflict merge-conflict-resolution git
"This branch has conflicts that must be resolved" but it's already merged
user_14960610
•
15
2
40722
pull-request git-merge-conflict merge-conflict-resolution github git
How do I explicitly mention which branch changes to apply while merging two conflicting branches in git?
user_76918030
•
3
1
63
git-merge-conflict merge-conflict-resolution rebase github git
Git custom merge driver with fallback to the built-in driver
user_3870760
•
2
1
668
git-merge-conflict git-merge git
IntelliJ IDEA - how to trigger Git conflicts resolving from a command line
user_1459890
•
5
2
4062
git-merge-conflict intellij-idea command-line git
How to resolve a git conflict by keeping all additions from both sides?
user_58244890
•
7
2
5316
git-merge-conflict merge-conflict-resolution git-rebase git-merge git
Git: Confusion about merge algorithm, conflict format, and interplay with mergetools
user_36167140
•
10
2
1099
git-merge-conflict file-format mergetool algorithm git
Hot Questions