Reboot or merge to upgrade to the last wizard, if not

Question

Created a new branch from the master, on which it was possible to work, but never changed any code. A week later, I am returning to get started, and now the wizard already has many changes.

Since I haven’t changed anything, would it be better to just reinstall or merge or something else from the main branch so that I can start working with the most modern code base?

Answer 1

You can reinstall your branch and play all your (nonexistent) commits on top of the wizard.

git checkout <branch>
git rebase master

I suggest this template because you did not share any commits by clicking. While this invariant is supported by rebasing, it retains fixed and relevant stories.