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