git-merge-conflict

54 Questions
Newest Active Unanswered Frequent
Score
View
Card Compact
git automerge result is unsatisfaying on a single file amongst others, I'd rather resolve that one with a three-way diff manually
user_26226570
•
2
4
54
git-merge-conflict merge git
In Git, after merging some files, I want to accept all "theirs" that are left in the merge. How do I do that?
user_5945710
•
5
3
170
git-merge-conflict git
Why don't merge conflict decorators appear in vscode?
user_139142680
•
2
1
147
codelens visual-studio-code git-merge-conflict git
How can I have git-checkout merge local modifications only if there's no conflict?
user_7884880
•
1
3
28
git-merge-conflict git-checkout git
Not getting GitHub merge conflicts Top-bar in Visual Studio Code
user_129426070
•
11
1
751
visual-studio-code git-merge-conflict merge-conflict-resolution git-merge git
Change loss in resolving git merge conflict
user_10324920
•
2
2
95
git-merge-conflict git-diff git-merge git
How to correct bug in merge - squash fix commit to merge commit
user_128049250
•
1
3
48
git-merge-conflict git-squash git-merge git
Branching from a feature branch and reconciling commits after main squash merge
user_62718890
•
1
1
81
git-merge-conflict git-squash git-merge version-control git
Git merge conflict window doesn't show in VSCode (CodeLens)
user_93723840
•
2
2
1210
vscode-git codelens visual-studio-code git-merge-conflict git
simple example to demonstrate a git principal with stash and pull
user_48762570
•
2
2
58
git-merge-conflict git-stash git-pull git
Hot Questions