Skip to content

Instantly share code, notes, and snippets.

@Duckle29

Duckle29/git reverting.md

Last active February 18, 2020 10:04
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 Duckle29/0a129e2b986016d8b7319376d2de9464 to your computer and use it in GitHub Desktop.
Save Duckle29/0a129e2b986016d8b7319376d2de9464 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
git reverting.md

Hey there.

Because we got stuck in the git adventure. I figured I'd write this little gist for you on how to get back to what you know :)

In msys, run:

git branch

it should show master, takane, plank_ene6, cheka and maybe more

if takane isn't selected, do git checkout takane then to get all your changes on your personal branch:
git merge -m "Merged plank keymap" plank_ene6
git merge -m "Merged custom keyboard" cheka

That should make sure you have all your changes in one place

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