On Fri, Aug 1, 2014 at 11:18 AM, Tom Chiverton <t...@apache.org> wrote:
> 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 ? > Yes, it did. For the develop branch. You should subscribe to comm...@flex.apache.org so that you can see all the commit emails. > > 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 > Looks like develop was okay. Develop branch is at ed6da554e currently. You can see for yourself by looking at https://github.com/apache/flex-sdk. There is a note on top that says "latest commit ed6da554e9 <https://github.com/apache/flex-sdk/commit/ed6da554e931c317717f8e8673e1f698140b0be1> Tom Chiverton authored an hour ago" > ! [rejected] master -> master (non-fast-forward) > Push into Master was rejected because your master is not up-to-date locally. But you should not be checking into master on a day to day basis. That gets updated by the Release Manager when we push a release. > 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. > > I think you have 'push all branches' set to true. You need to disable that to avoid pushing changes from master. Or when pushing, you can select a specific branch to push. > All the GUIs I've seen just make git worse :-/ > TortoiseGit has been very good for me. It integrates with windows explorer and is pretty neat. Thanks, Om > > -- > Tom >
