git-merge-conflict

54 Questions
Newest Active Unanswered Frequent
Score
View
Card Compact
detect git conflict markers in committed code
user_4583210
•
1
2
163
git-merge-conflict conflict git
Github Desktop not displaying merge conflicts interface
user_175757000
•
1
0
273
github-desktop git-merge-conflict merge-conflict-resolution github
What is a minimal "git rebase" example where the same conflict reappears?
user_8759150
•
2
2
192
git-merge-conflict git-rebase git
How to save merge state in Git?
user_19970660
•
3
2
599
gitlab git-merge-conflict git
git merge conflicts: which commit was the common ancestor?
user_4075880
•
3
2
247
git-merge-conflict git
Does git mv folder and merge afterward new file from feature branch to the modified path, deletes its history?
user_117050210
•
2
1
114
consolidation git-history git-merge-conflict git-mv git
Git mv doesn't work as expected (wrong files location)
user_117050210
•
2
1
256
git-merge-conflict git-mv git
Overwrite via git stash apply
user_134242590
•
3
1
971
git-merge-conflict git-stash git
Conflict Resolution in Azure DevOps with Protected Branches
user_127493640
•
1
0
85
devops git-merge-conflict azure-devops azure git
VS Code compare changes, how to accept/reject
user_5124800
•
1
0
200
visual-studio-code git-merge-conflict merge-conflict-resolution merge
Hot Questions