Rebase Conflicts

Important

You will solve 2 cases:

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

2. A rebase producing multiple conflicts. You’ll resolve them by editing non-conflicted Changes, something you’ve probably never done in Git.