Advertisement
Guest User

Untitled

a guest
May 5th, 2017
121
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.31 KB | None | 0 0
  1. benjamin@io ~/projects/cryptometer (feature/ERP-15-cryptometer-integration-in-nav) $ git status
  2. On branch feature/ERP-15-cryptometer-integration-in-nav
  3. Your branch is up-to-date with 'origin/feature/ERP-15-cryptometer-integration-in-nav'.
  4. nothing to commit, working tree clean
  5. benjamin@io ~/projects/cryptometer (feature/ERP-15-cryptometer-integration-in-nav) $ git rebase 372d2f2466bf0ed8325ddb99f104510cf73592cd --onto 57bf7b5427e8233a2421730020b8d213906c0d28 -Xignore-space-at-eol
  6. First, rewinding head to replay your work on top of it...
  7. Already applied: 0001 Updated to newest Externals
  8. error: Your local changes to the following files would be overwritten by merge:
  9. Externals/Utilities
  10. Please commit your changes or stash them before you merge.
  11. Aborting
  12. Unknown exit code (128) from command: git-merge-recursive 8a4c2d10444998dd69705511561367c9a76080e5^ -- HEAD 8a4c2d10444998dd69705511561367c9a76080e5
  13. benjamin@io ~/projects/cryptometer (feature/ERP-15-cryptometer-integration-in-nav +|REBASE-m 2/9) $ git status
  14. rebase in progress; onto 57bf7b5
  15. You are currently rebasing branch 'feature/ERP-15-cryptometer-integration-in-nav' on '57bf7b5'.
  16. (all conflicts fixed: run "git rebase --continue")
  17.  
  18. Changes to be committed:
  19. (use "git reset HEAD <file>..." to unstage)
  20.  
  21. modified: Externals/Utilities
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement