Erik,
Arff, a quick review told me the git merge --no-ff Flex-12345 should go
before git pull --ff-only, if yo want to correct it ;-)
Thanks,
-Fred
-----Message d'origine-----
From: Frédéric THOMAS
Sent: Thursday, March 21, 2013 10:34 AM
To: dev@flex.apache.org
Subject: Re: [Git] getting workflow onto Wiki
All done !
Thanks,
-Fred
-----Message d'origine-----
From: Erik de Bruin
Sent: Thursday, March 21, 2013 10:29 AM
To: dev@flex.apache.org
Subject: Re: [Git] getting workflow onto Wiki
I have saved what I had, will not edit until you ping here with an OK.
EdB
On Thu, Mar 21, 2013 at 10:26 AM, Frédéric THOMAS
<webdoubl...@hotmail.com> wrote:
I wouldn't like double work, can you just hold one 1mn, the time I copy
paste on the wiki, then you can restart ?
Thanks,
-Fred
-----Message d'origine----- From: Erik de Bruin
Sent: Thursday, March 21, 2013 10:21 AM
To: dev@flex.apache.org
Subject: Re: [Git] getting workflow onto Wiki
Fred,
Please hold on, I'm reading through all discussions relating to Git
and adding everything that has been discussed by just copy-pasting.
Once I'm done with that, I'll give the page(s) some initial structure
and ask for input from the list. Does that sound like a plan?
EdB
On Thu, Mar 21, 2013 at 10:16 AM, Frédéric THOMAS
<webdoubl...@hotmail.com> wrote:
Erik,
Can I update the daily workflow ?
-Fred
-----Message d'origine----- From: Erik de Bruin Sent: Thursday, March 21,
2013 8:28 AM To: dev@flex.apache.org Subject: [Git] getting workflow onto
Wiki
Hi,
I've started to get some of the git related information, including the
abundance of viewpoints, onto the wiki [1] ...
I'm getting really ticked off that some of the most vocal proponents
of the move to git - promising all the time to really (yes, really)
help out when it did happen - seem to have dropped of the face of the
earth. I have to try really hard not to name names, but you know who
you are, and I think you should be ashamed. You've basically left this
project in a mess and are doing nothing to help at all.
EdB
1: https://cwiki.apache.org/confluence/display/FLEX/Git+Guide
--
Ix Multimedia Software
Jan Luykenstraat 27
3521 VB Utrecht
T. 06-51952295
I. www.ixsoftware.nl
--
Ix Multimedia Software
Jan Luykenstraat 27
3521 VB Utrecht
T. 06-51952295
I. www.ixsoftware.nl
--
Ix Multimedia Software
Jan Luykenstraat 27
3521 VB Utrecht
T. 06-51952295
I. www.ixsoftware.nl
