I’m not an expert on resolving conflicts in Git, but my understanding is that it’s possible to resolve code conflicts even in moved files.
As I understand things, it should be possible to: 1. Create a new “maven” branch. 2. Move files around in the new branch. 3. Make changes to the original files on develop. 4. More of 2 and 3 in any order. 5. Merge develop into maven. 6. Resolve conflicts (hopefully easily.) 7. Merge maven back into develop. Am I wrong? On Feb 18, 2016, at 2:50 PM, Christofer Dutz <christofer.d...@c-ware.de> wrote: > As I said in the other Mail, I can't just change these thing as you guys are > working on develop. > > That's a special case ... If I branch and do the changes there and you > continue to work on it, I can't merge stuff back. > The alternative of me changing it on develop would break the Ant build. So in > this case it's the option for you guys to stop working for quite some time > and me to do the refactoring or you do it during your work (You probably have > more free time to work on Flex than I do) > > Well I'll shut my fingers for now (and sorry for that crappy mail ... writing > emails on mobile phones while being at the Hotel breakfast sort of sucks) > > Chris > > ________________________________________ > Von: Alex Harui <aha...@adobe.com> > Gesendet: Donnerstag, 18. Februar 2016 08:57 > An: dev@flex.apache.org > Betreff: Re: AW: [FALCONJX]Compiling Falcon with externs problems > > On 2/17/16, 11:14 PM, "Christofer Dutz" <christofer.d...@c-ware.de> wrote: > >> I'm currently not contributing, choose it's impossible to setup. And I'm >> just fed up with the build and could even work through the quirks. I just >> don't want to anymore. >> >> As justin said, I have a paid job where I have to deal with that sort of >> crap every day. My open source involvement is my hobbie. So it's >> reasonable for me not to do the stuff I have to do in my day job. >> >> It has been the problem with flex, that it has a very demanding user set. >> I got to know that during my time with flexmojos. You have to distinguish >> between the people demanding stuff, cause they want ur and the ones that >> would give stuff back. Apache is about the "please help me help you" >> people and not the "you have to give me stuff cause I use your software" >> ones. > > Chris, my take on your tone is that I have to give you Maven stuff or else > you won't contribute. It does not sound like "please help me help you". > Falcon clearly isn't "impossible" to set up, because several folks have > set it up. > > Please help me help you to help me help you ;-). Let's have a discussion > on what should move where and in what order to make Falcon more amenable > to Maven. Nobody is arguing that Maven for Falcon isn't important or that > your contributions aren't important, but saying the current state is > "impossible" and saying you won't contribute until someone else takes > action is not going to make Maven for Falcon happen faster than starting a > conversation in a collegial rather than demanding tone. So far, nobody > has spoken out to say that Maven for Falcon is going to be the killer > feature to show at the next couple of public FlexJS events, so I'm still > spending most of my time trying to develop enough new features that I hope > will get more people to try to migrate their Flex projects to FlexJS and > start asking where the Maven integration is. > > Now please, can we start a thread on what the next actual steps are? > > -Alex >
