Guest User

Untitled

a guest
Jun 29th, 2010
99
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.29 KB | None | 0 0
  1. $ git revert bf955770860d2ab96986e6cff0302d9b4e7c9f93
  2. warning: Cannot merge binary files: node.db4o (HEAD vs. parent of bf95577... Upd
  3. ate)
  4.  
  5. Automatic revert failed. After resolving the conflicts,
  6. mark the corrected paths with 'git add <paths>' or 'git rm <paths>'
  7. and commit the result.
Advertisement
Add Comment
Please, Sign In to add comment