{"thread":{"id":"36197","subject":"push fail","startedAt":"2014-03-17T13:06:56Z","lastAt":"2014-03-18T01:58:06Z","messageCount":4,"participants":["shawn wilson","Dragos Foianu","Matthieu Moy"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"236880","messageId":"CAH_OBie+KrSjtqLinbv8sJAOCu26j8xVzBQJHdHTB44V07GsXg@mail.gmail.com","threadId":"36197","inReplyTo":null,"subject":"push fail","fromName":"shawn wilson","fromEmail":"ag4ve.us@gmail.com","sentAt":"2014-03-17T13:06:56Z","receivedAt":"2014-03-17T13:06:56Z","isPatch":false,"sender":{"key":"ag4ve.us@gmail.com","avatar":null},"body":"How do I get more info here (and hopefully resolve this)?\n\n % git push\nTo ssh://server/foo/repo.git\n ! [rejected] test -> test (non-fast-forward)\nerror: failed to push some refs to 'ssh://server/foo/repo.git'\n"},{"id":"236881","messageId":"loom.20140317T142900-203@post.gmane.org","threadId":"36197","inReplyTo":"CAH_OBie+KrSjtqLinbv8sJAOCu26j8xVzBQJHdHTB44V07GsXg@mail.gmail.com","subject":"Re: push fail","fromName":"Dragos Foianu","fromEmail":"dragos.foianu@gmail.com","sentAt":"2014-03-17T13:34:24Z","receivedAt":"2014-03-17T13:34:24Z","isPatch":false,"sender":{"key":"dragos.foianu@gmail.com","avatar":null},"body":"shawn wilson gmail.com> writes:\n\n> \n> How do I get more info here (and hopefully resolve this)?\n> \n> % git push\n> To ssh://server/foo/repo.git\n> ! [rejected] test -> test (non-fast-forward)\n> error: failed to push some refs to 'ssh://server/foo/repo.git'\n> \n\n\"non-fast-forward\" means that someone else pushed to branch test before you\ndid and your push would end up overwriting their changes. Make sure you\nmerge your local branch with the remote branch:\n\ngit pull origin test\n\nIt might also be a result of local destructive changes made by \"git rebase\".\nIf you're absolutely certain you will not mess up the remote branch you can\nadd the \"--force\" parameter when you push.\n"},{"id":"236882","messageId":"vpq38ih7xrv.fsf@anie.imag.fr","threadId":"36197","inReplyTo":"CAH_OBie+KrSjtqLinbv8sJAOCu26j8xVzBQJHdHTB44V07GsXg@mail.gmail.com","subject":"Re: push fail","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2014-03-17T13:36:04Z","receivedAt":"2014-03-17T13:36:04Z","isPatch":false,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"shawn wilson writes:\n\n> How do I get more info here (and hopefully resolve this)?\n>\n> % git push\n> To ssh://server/foo/repo.git\n> ! [rejected] test -> test (non-fast-forward)\n> error: failed to push some refs to 'ssh://server/foo/repo.git'\n\nYou probably have a configuration that disables advices (look in\n~/.gitconfig for an [advice] section. If you're a beginner, you probably\nshouldn't deactivate these advices).\n\nGit normally says something like this:\n\nTo /tmp/git\n ! [rejected] branch3 -> branch3 (non-fast-forward)\nerror: failed to push some refs to '/tmp/git'\nhint: Updates were rejected because the tip of your current branch is behind\nhint: its remote counterpart. Merge the remote changes (e.g. 'git pull')\nhint: before pushing again.\nhint: See the 'Note about fast-forwards' in 'git push --help' for details.\n\nThe latest version says this which you may find clearer:\n\nTo /tmp/git\n ! [rejected] branch3 -> branch3 (fetch first)\nerror: failed to push some refs to '/tmp/git'\nhint: Updates were rejected because the remote contains work that you do\nhint: not have locally. This is usually caused by another repository pushing\nhint: to the same ref. You may want to first integrate the remote changes\nhint: (e.g., 'git pull ...') before pushing again.\nhint: See the 'Note about fast-forwards' in 'git push --help' for details.\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"236949","messageId":"CAH_OBiegRbR6MXx2awuxpOkagLcPG-w4vE0zh78Z+SdUK_7vAg@mail.gmail.com","threadId":"36197","inReplyTo":"loom.20140317T142900-203@post.gmane.org","subject":"Re: push fail","fromName":"shawn wilson","fromEmail":"ag4ve.us@gmail.com","sentAt":"2014-03-18T01:58:06Z","receivedAt":"2014-03-18T01:58:06Z","isPatch":false,"sender":{"key":"ag4ve.us@gmail.com","avatar":null},"body":"Thanks.\n\nYeah, I should've thought to do a pull....\n\nOn Mon, Mar 17, 2014 at 9:34 AM, Dragos Foianu wrote:\n> shawn wilson gmail.com> writes:\n>\n>>\n>> How do I get more info here (and hopefully resolve this)?\n>>\n>> % git push\n>> To ssh://server/foo/repo.git\n>> ! [rejected] test -> test (non-fast-forward)\n>> error: failed to push some refs to 'ssh://server/foo/repo.git'\n>>\n>\n> \"non-fast-forward\" means that someone else pushed to branch test before you\n> did and your push would end up overwriting their changes. Make sure you\n> merge your local branch with the remote branch:\n>\n> git pull origin test\n>\n> It might also be a result of local destructive changes made by \"git rebase\".\n> If you're absolutely certain you will not mess up the remote branch you can\n> add the \"--force\" parameter when you push.\n>\n> --\n> To unsubscribe from this list: send the line \"unsubscribe git\" in\n> the body of a message to majordomo@vger.kernel.org\n> More majordomo info at http://vger.kernel.org/majordomo-info.html\n"}]}