Skip to content

Instantly share code, notes, and snippets.

@jqtrde

jqtrde/using-git.md

Created May 8, 2014 13:39
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 jqtrde/4a29444fae0e0ca0621f to your computer and use it in GitHub Desktop.
Save jqtrde/4a29444fae0e0ca0621f to your computer and use it in GitHub Desktop.
Download ZIP
Using git
Raw
using-git.md

Merge conflict workflow

  • 'git mergetool' will open Kaleidoscope
  • Do your thing
  • If the merge is junk, use 'git merge --abort' to start over.
  • If you realized your mistake after you committed the change, roll back with 'git reset --hard `
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment