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