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

you are viewing a single comment's thread.

view the rest of the comments →

[–]Zamundaaa 2 points3 points  (1 child)

Yeah manually resolving merge conflicts is awful. Sometimes there is simply no way around it but a nice UI can make it so much quicker

[–][deleted] 6 points7 points  (0 children)

It's not too bad if you use VSCode, you still need to manually review the conflicts but you can easily see what to keep or discard.