merge-conflict-resolution

65 Questions
Newest Active Unanswered Frequent
Score
View
Card Compact
How to revert to the old git merge editor in VS Code?
user_199402800
•
1
0
177
visual-studio-code merge-conflict-resolution
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
How to change the conflict resolution interface in vscode?
user_132294820
•
15
2
1602
visual-studio-code merge-conflict-resolution
How to make Azure DevOps not put the query of a pull request on one single line when using Synapse?
user_125811880
•
1
1
36
azure-synapse merge-conflict-resolution azure-devops
Git checkout --ours path/to/file.txt returns "updated 0 paths from the index"
user_102369190
•
1
1
139
merge-conflict-resolution binaryfiles github git
Why do two identical peices of code cause so many conflicts in intellij's three way diff?
user_192959520
•
1
1
31
merge-conflict-resolution diff intellij-idea git
VS Code on Mac doesn't have merge conflict acceptance tools?
user_28979890
•
2
0
412
visual-studio-code merge-conflict-resolution
PR from release to main has conflicts
user_182994250
•
1
1
225
git-flow merge-conflict-resolution git-merge git
How to resolve merge conflict when one branch has modified a file and the other has moved it (but git thinks it has been deleted and a new file made)
user_30528320
•
2
1
249
merge-conflict-resolution meld mergetool merge git
Facing issues merging develop to release branch after feature branch got merged to release directly
user_14724930
•
1
1
50
merge-conflict-resolution branching-and-merging github git
Hot Questions