http://help.github.com/dealing-with-lineendings/
On Thu, Apr 8, 2010 at 12:37 PM, Peter A Pilgrim <[email protected]>wrote: > > > On 8 Apr, 01:36, Chris Phelps <[email protected]> wrote: > > Hi > > There was one issue during merging that I have never resolved. > > Dick attempted to merge my changes back at the round up on the day, > however my files were wholly incompatible because the diffs where > linefeed changes. > > How do we solve this CR <=> LF / CR problem, with git, once and for > all? > > > > > > >> For those who want to take a look, the forks in question are in github > > >> "rooted" athttp://github.com/dickwall/ZenWriterFX. Someone with more > > >> github kung fu might even be able to reconstruct some of our troubles > > >> from the changesets. > > > > >> Hope that helps > > >> Chris > > > > > Hi > > > > > Incidentally, I have gone back to my stream on github and implement a > > > DraggableLineBorder.fx component. It sort resizes most of the time a > > > child node component. However, may be it is me or the FX 1.2 SDK, the > > > event handling can be flaky. > > > > > What is the command from the round up that push my changeset up to > > > Dick Wall's Repo? > > > Or what is the command that notified Dick Wall that my changeset was > > > incoming? > > > Sorry I cannot remember it all. > > > > >http://github.com/dickwall/ZenWriterFX/network > > > > >> Joey Gibson wrote: > > > > >>> I've been looking at Hg and git a lot lately, and the possibility of > > >>> moving from SVN to one of these. I heard the guys mention that they > > >>> had problems using Git and/or Github at the roundup, and I would be > > >>> extremely interested to hear what the problems were and how you got > > >>> around them (assuming you did). I've only used a DVCS in testing, and > > >>> haven't actually used one in production, so any insights would be > very > > >>> valuable. > > > > >>> Joey > > > > >>> -- > > >>> Blog:http://joeygibson.com > > >>> Twitter:http://twitter.com/joeygibson > > >>> FriendFeed:http://friendfeed.com/joeygibson > > >>> Facebook:http://facebook.com/joeygibson > > >>> -- > > >>> 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]<javaposse%[email protected]> > . > > >>> For more options, visit this group at > > >>>http://groups.google.com/group/javaposse?hl=en. > > -- > 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]<javaposse%[email protected]> > . > For more options, visit this group at > http://groups.google.com/group/javaposse?hl=en. > > -- 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.
