Thanks for looking into this. I don't think the root problem we were running into had to do with CRLF because at least in one case the merge conflict happened between Dick's changes and mine -- and Dick and I were using Linux and OSX (guess who used what), which both correctly use \n as the line terminator. Also, we never pushed our corrupt repositories - we deleted them and hand applied the changes - so those aren't in github for people to play with.
-- Tor On Apr 8, 12:36 am, "[email protected]" <[email protected]> wrote: > I just played around a bit with Peter, Dick and Matts repositories. > > * Clone from peter: > # git clone git://github.com/peterpilgrim/ZenWriterFX.git > > * Merge in changes from Dick > # git remote add dickwall git://github.com/dickwall/ZenWriterFX > # git fetch dickwall > # git merge dickwall/master > > I could have done git pull dickwall master, which is the same as fetch > + merge. Also I only need to add the remote once. I got no conflicts > here as peters repo was up to date > > * Merge changes from Matt > # git remote add mattgrommes git://github.com/mattgrommes/ZenWriterFX.git > # git pull mattgrommes master > > Now I got conflicts, as these projects had apparently gone in > different directions. I needed to merge .gitignore, Main and Theme. > But I think the files where widly different at this point: > > # git merge-base remotes/mattgrommes/master remotes/dickwall/master > 812e3a3d0d33610c3624cf683895bd754b55e4bd > # git log --oneline 812e3a3d0d33610c3624cf683895bd754b55e4bd remotes/ > dickwall/master|wc -l > 32 > # git log --oneline 812e3a3d0d33610c3624cf683895bd754b55e4bd remotes/ > mattgrommes/master|wc -l > 40 > > Ie. After the common point in time, matt had 40 commits and Dick 32, > which resolved in conflicts in 2 files + .gitignore. But it did look > to me like it was an issue off newline characters messing up the > merges a bit. With meld I could however manage the merge pretty nicely > still. If anyone else wants to play around with these things I have at > least provided some commands to start off with. I do think you might > have been working under a bit extreme conditions though, with so many > people changing the same files at the same time in a very similar > manner. -- You received this message because you are subscribed to the Google Groups "The Java Posse" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/javaposse?hl=en.
