Use merge conflict actions

text

Open conflicted file and use the conflict action buttons in the editor

Learn the surrounding workflow

Compare similar commands or jump into common fixes when this command is part of a bigger troubleshooting path.

Same sheet · prioritizing Compare and Merge Conflicts

See file history and source control timeline.

Open In sheettextsame section

Compare arbitrary files in the explorer.

Open In sheettextsame section

Clone via built-in Git command.

Open In sheettext1 tag match

Review changed files directly in diff view.

Open In sheettext1 tag match

Stage only part of a file from the diff editor.

Open In sheettext1 tag match

Pull and push using the status bar sync action.

Open In sheettext1 tag match