Use the Git Changes window to create a merge commit and resolve the conflict. ... Resolve merge conflicts Go over your conflicts line by line, and choose between keeping the right or the left side by selecting the checkboxes. Keep or ignore all of your conflicting changes. Manually edit your code in the Result window. Dec 14, 2022