Skip to content

Instantly share code, notes, and snippets.

@ohammersmith

ohammersmith/gist:35247

Created December 12, 2008 19:48
Show Gist options
  • Save ohammersmith/35247 to your computer and use it in GitHub Desktop.
Save ohammersmith/35247 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
gnod:git-rebase-test otto$ git checkout version_1_0
Switched to branch "version_1_0"
gnod:git-rebase-test otto$ git cherry-pick 6be17bdbf6c87247ac7c2cbeb02ffa760e52cd39
Auto-merged file5.txt
CONFLICT (content): Merge conflict in file5.txt
Automatic cherry-pick failed. After resolving the conflicts,
mark the corrected paths with 'git add <paths>' or 'git rm <paths>' and commit the result.
When commiting, use the option '-c 6be17bd' to retain authorship and message.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment