No, if you want to update your local branch first then the correct way to do that would be to run: $ git checkout feature-branch $ git merge main #

No, if you want to update your local branch first then the correct way to do that would be to run: $ git checkout feature-branch $ git merge main # test stuff, make sure everything looks good $ git checkout main $ git merge feature-branch --no-ff No rebasing or other history rewrites required.