Don't like ads? PRO users don't see any ads ;-)
Guest

Untitled

By: a guest on May 5th, 2012  |  syntax: None  |  size: 0.29 KB  |  hits: 9  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. > git status
  2. # On branch master
  3. nothing to commit (working directory clean)
  4. > git cherry-pick 90aa02f
  5. error: Your local changes to 'src/main/java/no/kvikshaug/gh/modules/Bofh.java' would be overwritten by merge.  Aborting.
  6. Please, commit your changes or stash them before you can merge.