I've been using the git gui extension for a while and resolve conflicts in vs code. I also just use a lot of cli
you are viewing a single comment's thread
view the rest of the comments
view the rest of the comments
I've been using the git gui extension for a while and resolve conflicts in vs code. I also just use a lot of cli