trying to puch android project to Git, and getting this error: ~/Dropbox/AndroidStudioProjects/test/xxx (master|MERGING) $ git push -u origin master Username for 'http://git.yyy.com': xxx Password for 'http://yyy.com': To http://git.yyy.git ! [rejected] master -> master (non-fast-forward) error: failed to push some refs to 'http://yyy.git' hint: Updates were rejected because the tip of your current branch is behind hint: its remote counterpart. Integrate the remote changes (e.g. hint: 'git pull ...') before pushing again. hint: See the 'Note about fast-forwards' in 'git push --help' for details. and contents of my project folder is:
ls -la . MyCalories2 MyCalories2: total 15 drwxr-xr-x 1 Jalle Administ 4096 Jul 25 21:46 . drwxr-xr-x 1 Jalle Administ 4096 Jul 25 21:49 .. -rw-r--r-- 1 Jalle Administ 64 Jul 16 19:59 .gitignore drwxr-xr-x 3 Jalle Administ 0 Jul 25 14:37 .gradle drwxr-xr-x 15 Jalle Administ 4096 Jul 25 21:51 .idea -rw-r--r-- 1 Jalle Administ 870 Jul 16 20:01 MyCalories2.iml drwxr-xr-x 1 Jalle Administ 4096 Jul 25 21:24 app drwxr-xr-x 3 Jalle Administ 0 Jul 25 14:37 build -rw-r--r-- 1 Jalle Administ 452 Jul 24 21:33 build.gradle drwxr-xr-x 3 Jalle Administ 0 Jul 25 14:37 gradle -rw-r--r-- 1 Jalle Administ 870 Jul 16 19:59 gradle.properties -rwxr-xr-x 1 Jalle Administ 5080 Jul 16 19:59 gradlew -rwxr-xr-x 1 Jalle Administ 2404 Jul 16 19:59 gradlew.bat -rw-r--r-- 1 Jalle Administ 435 Jul 16 19:59 local.properties drwxr-xr-x 5 Jalle Administ 0 Jul 25 14:37 parseproj -rw-r--r-- 1 Jalle Administ 16 Jul 16 19:59 settings.gradle $ git --version git version 1.9.4.msysgit.0 What do I do to push / merge changes to my repository ? -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
