Created a new branch off master to work on but never actually changed any code. Week later I'm coming back to start work and now master is many changes ahead.
Since I've not changed anything, would it be best to just rebase or merge or something else from master branch so I can start work with most up-to-date codebase?