Skip to content

Instantly share code, notes, and snippets.

@mbarrben

mbarrben/squash_steps.txt

Last active November 8, 2015 10:30
Show Gist options
  • Star 1 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save mbarrben/f37f4d2d9d9d3dd8bc66 to your computer and use it in GitHub Desktop.
Save mbarrben/f37f4d2d9d9d3dd8bc66 to your computer and use it in GitHub Desktop.
Download ZIP
Squash steps
Raw
squash_steps.txt
1. Check out develop and make pull from origin
git checkout develop
git pull
2. Check out your branch
git checkout <your-branch-name-here>
3. Merge develop into your branch
git merge develop
4. git reset --soft origin/develop
5. Commit the pending changes in a single commit
git commit -m "<your-commit-message-here>"
6. Force push to remote repo
git push -f origin <your-branch-name-here>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment