Advertisement
Guest User

Untitled

a guest
Sep 1st, 2014
239
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.69 KB | None | 0 0
  1. The previous cherry-pick is now empty, possibly due to conflict resolution.
  2. If you wish to commit it anyway, use:
  3.  
  4. git commit --allow-empty
  5.  
  6. Otherwise, please use 'git reset'
  7. # On branch cleanup-and-refactor
  8. # Changes not staged for commit:
  9. # (use "git add <file>..." to update what will be committed)
  10. # (use "git checkout -- <file>..." to discard changes in working directory)
  11. #
  12. # modified: privly-applications (new commits)
  13. #
  14. # Untracked files:
  15. # (use "git add <file>..." to include in what will be committed)
  16. #
  17. # privly-android/
  18. no changes added to commit (use "git add" and/or "git commit -a")
  19. Could not apply 3b63e3a... retargeted .gitmodules to the privly official fork
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement