Last login: Wed Aug 15 23:27:26 on ttys000
Zerocools-MacBook:~ pamusriharsha$ cd metadatarepository/
Zerocools-MacBook:metadatarepository pamusriharsha$ git add -A
Zerocools-MacBook:metadatarepository pamusriharsha$ git commit -m "Changes in the PackageForm and Controller"
[1.1 c28793f] Changes in the PackageForm and Controller
 2 files changed, 11 insertions(+), 9 deletions(-)
Zerocools-MacBook:metadatarepository pamusriharsha$ git push
Username:
Password:
Counting objects: 33, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (16/16), done.
Writing objects: 100% (17/17), 1.55 KiB, done.
Total 17 (delta 9), reused 0 (delta 0)
To https://github.com/rkorytkowski/openmrs-contrib-metadatarepository.git
   3a7ca55..c28793f  1.1 -> 1.1
Zerocools-MacBook:metadatarepository pamusriharsha$ git checkout master
error: Your local changes to the following files would be overwritten by checkout:
	web/src/main/java/org/openmrs/contrib/metadatarepository/webapp/controller/PackageFormController.java
	web/src/main/webapp/WEB-INF/pages/packageform.jsp
Please, commit your changes or stash them before you can switch branches.
Aborting
Zerocools-MacBook:metadatarepository pamusriharsha$ git pull
From https://github.com/rkorytkowski/openmrs-contrib-metadatarepository
   015d277..c28793f  master     -> origin/master
You asked me to pull without telling me which branch you
want to merge with, and 'branch.1.1.merge' in
your configuration file does not tell me, either. Please
specify which branch you want to use on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details.

If you often merge with the same branch, you may want to
use something like the following in your configuration file:

    [branch "1.1"]
    remote = <nickname>
    merge = <remote-ref>

    [remote "<nickname>"]
    url = <url>
    fetch = <refspec>

See git-config(1) for details.
Zerocools-MacBook:metadatarepository pamusriharsha$ git pull master
fatal: 'master' does not appear to be a git repository
fatal: The remote end hung up unexpectedly
Zerocools-MacBook:metadatarepository pamusriharsha$ git add -A
Zerocools-MacBook:metadatarepository pamusriharsha$ git commit -m "Fixed Tests"[1.1 307bf6f] Fixed Tests
 3 files changed, 10 insertions(+), 17 deletions(-)
Zerocools-MacBook:metadatarepository pamusriharsha$ git checkout master
Switched to branch 'master'
Your branch is behind 'origin/master' by 6 commits, and can be fast-forwarded.
Zerocools-MacBook:metadatarepository pamusriharsha$ git push -u origin master
Username:
Password:
To https://github.com/rkorytkowski/openmrs-contrib-metadatarepository.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/rkorytkowski/openmrs-contrib-metadatarepository.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again.  See the
'Note about fast-forwards' section of 'git push --help' for details.
Zerocools-MacBook:metadatarepository pamusriharsha$ git add -A
Zerocools-MacBook:metadatarepository pamusriharsha$ git commit -m "All fixes"
[master f493ce8] All fixes
 6 files changed, 29 insertions(+), 31 deletions(-)
Zerocools-MacBook:metadatarepository pamusriharsha$ git push -u origin master
Username:
Password:
To https://github.com/rkorytkowski/openmrs-contrib-metadatarepository.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/rkorytkowski/openmrs-contrib-metadatarepository.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again.  See the
'Note about fast-forwards' section of 'git push --help' for details.
Zerocools-MacBook:metadatarepository pamusriharsha$ git push
Username:
Password:
Counting objects: 46, done.
Delta compression using up to 2 threads.
Compressing objects: 100% (24/24), done.
Writing objects: 100% (26/26), 2.35 KiB, done.
Total 26 (delta 10), reused 0 (delta 0)
To https://github.com/rkorytkowski/openmrs-contrib-metadatarepository.git
   c28793f..307bf6f  1.1 -> 1.1
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/rkorytkowski/openmrs-contrib-metadatarepository.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again.  See the
'Note about fast-forwards' section of 'git push --help' for details.
Zerocools-MacBook:metadatarepository pamusriharsha$