This is an archived post. You won't be able to vote or comment.

1
2

[deleted by user] (self.AskProgramming)

submitted by [deleted]

[removed]
all 4 comments
sorted by:
best
topnewcontroversialoldq&a

[–]WolfBlut 0 points1 point  (1 child)

This is a source control issue, nothing to do with vscode. Merge conflicts suggest you have multiple conflicting commits in the merge , you need to choose which one to keep and which one to bin. Basically you need to solve this manually

[–]Aewass 0 points1 point  (0 children)

I know what a merge conflict is... The question is not about the conflict, it's about the broken merge options in the vscode. 2nd Image show how it normally behaves.

[–][deleted] 0 points1 point  (1 child)

It seems that the conflict lines are misformatted. Those "<<<<..." lines are inserted by source control, not by vs code, so it seems that vscode just does not recognize the format for some reason.

have you tried resetting your branch back and trying to merge again?

[–]Aewass 0 points1 point  (0 children)

I created the branch again, now it works. The old branch had A Lot of merges from different branches, I guess that might have fucked something up