Skip to content

Instantly share code, notes, and snippets.

@namzo

namzo/pull-from-master.md

Last active May 11, 2020 21:45
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save namzo/43fbf0794db12bed3c140681cc1bc0e4 to your computer and use it in GitHub Desktop.
Save namzo/43fbf0794db12bed3c140681cc1bc0e4 to your computer and use it in GitHub Desktop.
Download ZIP
Pull changes from feature branch to master
Raw
pull-from-master.md

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