On Friday 01 Aug 2014 11:14:19 OmPrakash Muppirala wrote:
> I just saw your commit; I am assuming you fixed the issue?

Oh, so it worked despite the error ?

Going back in my shell history, I see the first commit was only partly working ?
Counting objects: 118, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (22/22), done.
Writing objects: 100% (22/22), 7.25 KiB | 0 bytes/s, done.
Total 22 (delta 15), reused 0 (delta 0)
To https://git-wip-us.apache.org/repos/asf/flex-sdk.git
   6b1330f..ed6da55  develop -> develop
 ! [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.

All the GUIs I've seen just make git worse :-/

-- 
Tom

Reply via email to