Keyboard shortcuts

Press ← or → to navigate between chapters

Press S or / to search in the book

Press ? to show this help

Press Esc to hide this help

Goal

You will solve 2 cases:

  1. A rebase producing a single conflict. You'll resolve it by editing the file and you'll watch the resolution propagate to all descendants.

  2. A rebase producing 2 conflicts: you'll resolve them by editing Changes other than the conflicted ones, something you probably haven't done before in Git.