git-merge-conflict

54 Questions
Newest Active Unanswered Frequent
Score
View
Card Compact
git: Commit staged changes (without merge conflicts) during merge
user_70464410
•
2
1
254
git-stage git-merge-conflict git-commit git-merge git
How to complete or modify the message about a merge conflict?
user_63749800
•
1
1
70
git-merge-conflict git
What is the best way to resolve git conflicts after reformatting entire python code base with black?
user_54793450
•
3
0
271
black-code-formatter git-merge-conflict code-formatting git
How to automatically resolve multiple git conflicts under some path?
user_148256920
•
2
3
1644
git-merge-conflict merge-conflict-resolution git
GIT define simple conflict-resolving strategy
user_71325500
•
2
1
38
git-merge-conflict merge-conflict-resolution git-merge git
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 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
Avoiding a merge conflict in interactive rebase while reordering history
user_53209060
•
3
1
1007
git-merge-conflict rebase git
In Git, How can I rebase + squash a branch that has multiple merge commits in it's history without cherry-picking onto a totally new branch
user_106719420
•
2
1
51
git-merge-conflict git-rebase branching-and-merging version-control git
Why does git rebase trigger a merge conflict?
user_32848780
•
2
2
698
git-merge-conflict rebase git
Hot Questions