I just saw your commit; I am assuming you fixed the issue?

In any case, I recommend that you use a GUI tool (TortoiseGit, SmartGit,
etc.)  It will make your life much easier.

Here is what I usually do:

1.  Commit my code into my local branch
2.  Do a Fetch
3.  Then do a Rebase
4.  Then push to remote repo

Thanks,
Om




On Fri, Aug 1, 2014 at 11:06 AM, Tom Chiverton <t...@apache.org> wrote:

> TomOn Friday 01 Aug 2014 18:57:58  Chiverton wrote:
> > #git push
> > Username for 'https://git-wip-us.apache.org': t...@apache.org
>
> Doh ! Should be just 'tomc'.
>
> Now, why am I getting :
>
> To https://git-wip-us.apache.org/repos/asf/flex-sdk.git
>  ! [rejected]        master -> master (non-fast-forward)
> error: failed to push some refs to '
> https://git-wip-us.apache.org/repos/asf/flex-sdk.git'
> hint: Updates were rejected because a pushed branch tip is behind its
> remote
> hint: counterpart. If you did not intend to push that branch, you may want
> to
> hint: specify branches to push or set the 'push.default' configuration
> variable
> hint: to 'simple', 'current' or 'upstream' to push only the current branch.
>
> 'git rebase' says 'Current branch develop is up to date.'
>
> --
> Tom
> PS Did I mention life was simpler with SVN :-)
>

Reply via email to