Yeah, I should've thought to do a pull....
On Mon, Mar 17, 2014 at 9:34 AM, Dragos Foianu <dragos.foi...@gmail.com> wrote:
> shawn wilson <ag4ve.us <at> gmail.com> writes:
>> How do I get more info here (and hopefully resolve this)?
>> % git push
>> To ssh://server/foo/repo.git
>> ! [rejected] test -> test (non-fast-forward)
>> error: failed to push some refs to 'ssh://server/foo/repo.git'
> "non-fast-forward" means that someone else pushed to branch test before you
> did and your push would end up overwriting their changes. Make sure you
> merge your local branch with the remote branch:
> git pull origin test
> It might also be a result of local destructive changes made by "git rebase".
> If you're absolutely certain you will not mess up the remote branch you can
> add the "--force" parameter when you push.
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html