Git Merge Master Into Feature Branch Or Rebase Token