not all of the changes merged git code example

Example: update one branch to another

git checkout feature1
git merge develop