rakhisharma

Untitled

Mar 12th, 2016
67
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 1.39 KB | None | 0 0
  1. rakhi@rakhi-Inspiron-3542:~/mozilla-central$ hg rebase -s c21b61c40139 -d E
  2. abort: uncommitted changes
  3. rakhi@rakhi-Inspiron-3542:~/mozilla-central$ hg rebase -s 6e1A2LcpW0g -d E
  4. abort: uncommitted changes
  5. rakhi@rakhi-Inspiron-3542:~/mozilla-central$ hg rebase --continue
  6. abort: no rebase in progress
  7. rakhi@rakhi-Inspiron-3542:~/mozilla-central$ hg up c21b61c40139
  8. merging browser/themes/shared/identity-block/identity-block.inc.css
  9. output file browser/themes/shared/identity-block/identity-block.inc.css appears unchanged
  10. was merge successful (yn)? n
  11. merging browser/themes/shared/identity-block/identity-block.inc.css failed!
  12. 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
  13. use 'hg resolve' to retry unresolved file merges
  14. rakhi@rakhi-Inspiron-3542:~/mozilla-central$ hg up c21b61c40139
  15. abort: outstanding merge conflicts
  16. rakhi@rakhi-Inspiron-3542:~/mozilla-central$ hg resolve
  17. abort: no files or directories specified
  18. (use --all to re-merge all unresolved files)
  19. rakhi@rakhi-Inspiron-3542:~/mozilla-central$ hg up 0650d36649e5
  20. abort: outstanding merge conflicts
  21. rakhi@rakhi-Inspiron-3542:~/mozilla-central$ hg resolve c21b61c40139
  22. arguments do not match paths that need resolving
  23. rakhi@rakhi-Inspiron-3542:~/mozilla-central$ hg rebase c21b61c40139
  24. hg rebase: invalid arguments
  25. rakhi@rakhi-Inspiron-3542:~/mozilla-central$ hg rebase -d master
  26. abort: uncommitted changes
Add Comment
Please, Sign In to add comment