Solution to Step 0 - START
Solution to Step 1 - Update feature branch via rebase.
There are new features on main.
Show the commit graph across all branches.
Update your feature branch.
Show the commit graph across all branches.
repo $ git log --graph --all --decorate --oneline
* 796a63e (HEAD -> feature) : Feature weitermachen.
* e65c718 : Feature anfangen.
| * 57f8edc (main) : Neuerung auf dem main
|/
* 097f971 Created file bar on branch main by bjoern.
* 9799da6 Created file foo on branch main by bjoern.
repo $ git rebase main
Rebasing (1/2)
Rebasing (2/2)
Successfully rebased and updated refs/heads/feature.
repo $ git log --graph --all --decorate --oneline
* 7d06138 (HEAD -> feature) : Feature weitermachen.
* a40b485 : Feature anfangen.
* 57f8edc (main) : Neuerung auf dem main
* 097f971 Created file bar on branch main by bjoern.
* 9799da6 Created file foo on branch main by bjoern.