Comment Comment by arcticbull Am I the only person who opens the whole conflicted project in VSCode and project-wide searches for ">>>>>>" parent arcticbull 4 years ago