Skip to content

Instantly share code, notes, and snippets.

@namzo

namzo/pull-from-master.md

Last active May 11, 2020
Embed
What would you like to do?
Pull changes from feature branch to master

1. Update your master branch:

git checkout master
git pull --rebase origin master

2. Merge changes from Master to feature branch

git checkout [feature branch name]
git merge --no-ff master

3. Check if your changes has been included (Optional)

git log

4. Push updated local branch to remote

git push origin [feature branch name]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment