Branch... I'm mixing metafors, must be tired. EdB
On Sat, May 4, 2013 at 8:18 PM, Erik de Bruin <e...@ixsoftware.nl> wrote: > Carlos, > > Please re-read the thread and see who started the git vs. SVN. And > please stop thinking that just because I don't like git I must not > know git. I know git and I don't like it. > > Let's move on. > > I've pushed the merged thread. > > EdB > > > > On Sat, May 4, 2013 at 8:08 PM, Carlos Rovira > <carlos.rov...@codeoscopic.com> wrote: >> Erik, since Apache Flex is on GIT...don't you think is time to stop mails >> about GIT or SVN? I left to respond mails about Git many months ago due to >> the fact that this project is about Flex...not about GIT. Many people in >> the list (and out of the list) criticized about high traffic in this list >> only to discuss about GIT. >> >> We're all here to contribute, collaborate and be as positive as possible. >> Please, try to close your bad entrance in the GIT world and try to learn >> more about the system so you end loving to work with. >> >> If you want I'd like you to offer to connect via screen sharing and help >> you to solve the problems you have. I'd like to see you one day saying "GIT >> is the best option that will ever happen to Apache Flex" ;). >> >> To end, taking into accoutn that this problem is due to resolve merge >> conflicts do you know about tools like DiffMerge ( >> http://www.sourcegear.com/diffmerge/) or Kaleidoscope ( >> http://www.kaleidoscopeapp.com). We use both tools at work every day to >> manage lots of complicated conflicts. This kind of tools are simply *a >> must* to resolve conflicts. >> >> Let me know if you want to accept my connect proposal and we could talk off >> list on how to do it. >> >> For me, this is my last mail about GIT in Apache Flex about its validity. >> >> >> 2013/5/4 Erik de Bruin <e...@ixsoftware.nl> >> >>> Also, I like this: first you say: >>> >>> > We never merge directly in develop >>> >>> ... Then you say: >>> >>> > 4.- merge back into develop >>> >>> ;-) >>> >>> EdB >>> >>> >>> >>> -- >>> Ix Multimedia Software >>> >>> Jan Luykenstraat 27 >>> 3521 VB Utrecht >>> >>> T. 06-51952295 >>> I. www.ixsoftware.nl >>> >> >> >> >> -- >> Carlos Rovira >> Director de Tecnología >> M: +34 607 22 60 05 >> F: +34 912 94 80 80 >> http://www.codeoscopic.com >> http://www.directwriter.es >> http://www.avant2.es > > > > -- > 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
