Guest User

Untitled

a guest
Oct 8th, 2020
97
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Bash 2.57 KB | None | 0 0
  1. C:\Users\Insookwa\openmrs-distro-referenceapplication>git reset --hard upstream origin
  2. fatal: ambiguous argument 'upstream': unknown revision or path not in the working tree.
  3. Use '--' to separate paths from revisions, like this:
  4. 'git <command> [<revision>...] -- [<file>...]'
  5.  
  6. C:\Users\Insookwa\openmrs-distro-referenceapplication>git reset --hard upstream master
  7. fatal: ambiguous argument 'upstream': unknown revision or path not in the working tree.
  8. Use '--' to separate paths from revisions, like this:
  9. 'git <command> [<revision>...] -- [<file>...]'
  10.  
  11. C:\Users\Insookwa\openmrs-distro-referenceapplication>git pull --rebase upstream master
  12. warning: no common commits
  13. remote: Enumerating objects: 448, done.
  14. remote: Counting objects: 100% (448/448), done.
  15. remote: Compressing objects: 100% (214/214), done.
  16. remote: Total 448 (delta 146), reused 392 (delta 94), pack-reused 0
  17. Receiving objects: 100% (448/448), 40.14 MiB | 919.00 KiB/s, done.
  18. Resolving deltas: 100% (146/146), done.
  19. From https://github.com/openmrs/openmrs-contrib-qaframework
  20.  * branch            master     -> FETCH_HEAD
  21.  * [new branch]      master     -> upstream/master
  22. error: could not apply 8d07d6b... Initial commit
  23. Resolve all conflicts manually, mark them as resolved with
  24. "git add/rm <conflicted_files>", then run "git rebase --continue".
  25. You can instead skip this commit: run "git rebase --skip".
  26. To abort and get back to the state before "git rebase", run "git rebase --abort".
  27. Could not apply 8d07d6b... Initial commit
  28. CONFLICT (add/add): Merge conflict in README.md
  29. Auto-merging README.md
  30. CONFLICT (add/add): Merge conflict in .gitignore
  31. Auto-merging .gitignore
  32.  
  33. C:\Users\Insookwa\openmrs-distro-referenceapplication> git reset --hard upstream master
  34. fatal: ambiguous argument 'upstream': unknown revision or path not in the working tree.
  35. Use '--' to separate paths from revisions, like this:
  36. 'git <command> [<revision>...] -- [<file>...]'
  37.  
  38. C:\Users\Insookwa\openmrs-distro-referenceapplication>git pull --rebase upstream master
  39. error: Pulling is not possible because you have unmerged files.
  40. hint: Fix them up in the work tree, and then use 'git add/rm <file>'
  41. hint: as appropriate to mark resolution and make a commit.
  42. fatal: Exiting because of an unresolved conflict.
  43.  
  44. C:\Users\Insookwa\openmrs-distro-referenceapplication> git reset --hard upstream master
  45. fatal: ambiguous argument 'upstream': unknown revision or path not in the working tree.
  46. Use '--' to separate paths from revisions, like this:
  47. 'git <command> [<revision>...] -- [<file>...]'
  48.  
  49. C:\Users\Insookwa\openmrs-distro-referenceapplication>
Add Comment
Please, Sign In to add comment