Step 1 / 4

Two diverged branches

Both `main` and `feature` have unique commits since they split at `c2`. We want to bring feature work into main.