how to merge main branch into feature branch code example Example: merge master into feature branch git checkout feature1 git merge master