Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- C:\Users\Insookwa\openmrs-distro-referenceapplication>git reset --hard upstream origin
- fatal: ambiguous argument 'upstream': unknown revision or path not in the working tree.
- Use '--' to separate paths from revisions, like this:
- 'git <command> [<revision>...] -- [<file>...]'
- C:\Users\Insookwa\openmrs-distro-referenceapplication>git reset --hard upstream master
- fatal: ambiguous argument 'upstream': unknown revision or path not in the working tree.
- Use '--' to separate paths from revisions, like this:
- 'git <command> [<revision>...] -- [<file>...]'
- C:\Users\Insookwa\openmrs-distro-referenceapplication>git pull --rebase upstream master
- warning: no common commits
- remote: Enumerating objects: 448, done.
- remote: Counting objects: 100% (448/448), done.
- remote: Compressing objects: 100% (214/214), done.
- remote: Total 448 (delta 146), reused 392 (delta 94), pack-reused 0
- Receiving objects: 100% (448/448), 40.14 MiB | 919.00 KiB/s, done.
- Resolving deltas: 100% (146/146), done.
- From https://github.com/openmrs/openmrs-contrib-qaframework
- * branch master -> FETCH_HEAD
- * [new branch] master -> upstream/master
- error: could not apply 8d07d6b... Initial commit
- Resolve all conflicts manually, mark them as resolved with
- "git add/rm <conflicted_files>", then run "git rebase --continue".
- You can instead skip this commit: run "git rebase --skip".
- To abort and get back to the state before "git rebase", run "git rebase --abort".
- Could not apply 8d07d6b... Initial commit
- CONFLICT (add/add): Merge conflict in README.md
- Auto-merging README.md
- CONFLICT (add/add): Merge conflict in .gitignore
- Auto-merging .gitignore
- C:\Users\Insookwa\openmrs-distro-referenceapplication> git reset --hard upstream master
- fatal: ambiguous argument 'upstream': unknown revision or path not in the working tree.
- Use '--' to separate paths from revisions, like this:
- 'git <command> [<revision>...] -- [<file>...]'
- C:\Users\Insookwa\openmrs-distro-referenceapplication>git pull --rebase upstream master
- error: Pulling is not possible because you have unmerged files.
- hint: Fix them up in the work tree, and then use 'git add/rm <file>'
- hint: as appropriate to mark resolution and make a commit.
- fatal: Exiting because of an unresolved conflict.
- C:\Users\Insookwa\openmrs-distro-referenceapplication> git reset --hard upstream master
- fatal: ambiguous argument 'upstream': unknown revision or path not in the working tree.
- Use '--' to separate paths from revisions, like this:
- 'git <command> [<revision>...] -- [<file>...]'
- C:\Users\Insookwa\openmrs-distro-referenceapplication>
Add Comment
Please, Sign In to add comment