Skip to content

Instantly share code, notes, and snippets.

@vivainio
Created October 2, 2017 07:00
Show Gist options
  • Select an option

  • Save vivainio/0cd7afcea49c7048a253316b3f9fdcb5 to your computer and use it in GitHub Desktop.

Select an option

Save vivainio/0cd7afcea49c7048a253316b3f9fdcb5 to your computer and use it in GitHub Desktop.

How to clean up a branch

  1. Current branch is features/unclean
  2. git checkout dev
  3. git checkout -b features/cleaned-up
  4. git merge --squash features/unclean
  5. Go to Git Extensions / git gui, and edit the staging (unstage whitespace differences and accidental changes etc)
  6. git push
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment