Advertisement
Guest User

Untitled

a guest
Nov 22nd, 2016
111
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.80 KB | None | 0 0
  1. ((no)% git review
  2. Errors running git rebase -p -i remotes/gerrit/master
  3. It seems that there is already a rebase-merge directory, and
  4. I wonder if you are in the middle of another rebase. If that is the
  5. case, please try
  6. git rebase (--continue | --abort | --skip)
  7. If that is not the case, please
  8. rm -fr "/home/dan/nova/.git/rebase-merge"
  9. and run me again. I am stopping in case you still have something
  10. valuable there.
  11. It is likely that your change has a merge conflict. You may resolve it in the working tree now as described above and then run 'git review' again, or if you do not want to resolve it yet (note that the change can not merge until the conflict is resolved) you may run 'git rebase --abort' then 'git review -R' to upload the change without rebasing.
  12. theobromine [/home/dan/nova] ☹ git review
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement