[barrym]

When I've done similar upgrades, I've often found it quicker to have the previous code available to me in another checked out repo rather than switch branches and have to deal with any possible uncommitted changes issues.

[philwelch]

You can also use git stash for that.