Merge fix-bug into main

In this step, we will demonstrate a fast-forward merge by merging fix-bug into main.

Switch to the branch we will merge into, main:

git switch main

Merge the branch fix-bug into main:

git merge fix-bug

Note that a fast-forward merge completed successfully.

Run the gloga command.

Note that main has now caught up to fix-bug; however, main and fix-bug are still parallel with add-dogs and add-cats.

---

⏴ Back

Next ⏵