Re: I must be going mad in my git-based on age

2014-08-04 Thread ayo
waving my Linux hat 2 aYo Binitie Managing Director @ PrestAds www.prestadsng.com www.ayobinitie.com mrbinitie.blogspot.com From: OmPrakash Muppirala Sent: ‎Monday‎, ‎August‎ ‎4‎, ‎2014 ‎6‎:‎31‎ ‎PM To: dev@flex.apache.org On Mon, Aug 4, 2014 at 10:27 AM, Tom Chiverton wrote: > >

Re: I must be going mad in my git-based on age

2014-08-04 Thread Tom Chiverton
On Monday 04 Aug 2014 10:31:50 OmPrakash Muppirala wrote: > Setting it to 'current' should do the trick. Ta. I have to commit something as soon as it finishes compiling so that'll be a good test. -- Tom

Re: I must be going mad in my git-based on age

2014-08-04 Thread OmPrakash Muppirala
On Mon, Aug 4, 2014 at 10:27 AM, Tom Chiverton wrote: > > 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. > > Is that the 'push.default' config value ? What shou

Re: I must be going mad in my git-based on age

2014-08-04 Thread Tom Chiverton
> 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. Is that the 'push.default' config value ? What should I set it too ? > TortoiseGit has been very good for me. It int

Re: I must be going mad in my git-based on age

2014-08-01 Thread OmPrakash Muppirala
On Fri, Aug 1, 2014 at 11:18 AM, Tom Chiverton 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.

Re: I must be going mad in my git-based on age

2014-08-01 Thread Tom Chiverton
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

Re: I must be going mad in my git-based on age

2014-08-01 Thread OmPrakash Muppirala
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 r

Re: I must be going mad in my git-based on age

2014-08-01 Thread Tom Chiverton
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) er

I must be going mad in my git-based on age

2014-08-01 Thread Tom Chiverton
#git push Username for 'https://git-wip-us.apache.org': t...@apache.org Password for 'https://t...@apache.org@git-wip-us.apache.org': fatal: unable to access 'https://git-wip-us.apache.org/repos/asf/flex-sdk.git/': The requested URL returned error: 500 I don't use git very much outside of Flex