Skip to content

Instantly share code, notes, and snippets.

@luizventurote
Last active April 18, 2017 15:20
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 luizventurote/c8ce71c1153fc5217c822814c3b5960a to your computer and use it in GitHub Desktop.
Save luizventurote/c8ce71c1153fc5217c822814c3b5960a to your computer and use it in GitHub Desktop.
Fix Git commit after rebase

git reset --hard origin/staging

git merge --no-edit feature/theme

git push

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment