how to pull changes from one branch to another without a conflict code example Example: update one branch to another git checkout feature1 git merge develop