merge-conflict-resolution

65 Questions
Newest Active Unanswered Frequent
Score
View
Card Compact
How to merge a PR w/conflicts in GitHub, **without** merging base into head (the other way) first?
user_86210490
•
3
0
744
pull-request git-merge-conflict merge-conflict-resolution github git
How to resolve "file location" conflicts during rebase using the suggested resolution?
user_18854420
•
5
1
3231
merge-conflict-resolution rebase git
Github resolving conflicts always merges base branch to my current branch
user_13450890
•
5
2
3267
merge-conflict-resolution merge github
How to inspect manual conflict resolution in merge commits where the resolution is performed cleanly using one of the parents
user_13355110
•
4
1
294
git-merge-conflict merge-conflict-resolution merge git
Re-checking for merge conflicts in VSTS (Azure DevOps)
user_17212380
•
12
1
4033
pull-request merge-conflict-resolution azure-devops
Who is `them` and `us` in a `git revert`?
user_45618870
•
6
4
605
merge-conflict-resolution git-revert git
git merge equivalent of git rebase --onto
user_128543720
•
3
2
855
merge-conflict-resolution git-rebase git-merge rebase git
What are the Git conflict markers syntax/rules?
user_19172980
•
3
1
1189
merge-conflict-resolution perl git regex
Git reporting a merge conflict, but hunks are identical
user_8769370
•
2
1
216
vim-fugitive merge-conflict-resolution vimdiff git-merge git
Avoid re-resolving conflicts in a git rebase including merge commits
user_5658780
•
6
1
1703
merge-conflict-resolution rebase git
Hot Questions