git add . git commit -m "Added changes in feature1" ... When you click Compare Changes in VS Code during a merge conflict, it opens a side-by-side diff view of the conflicting file.