On 8 Apr, 11:51, Erlend Hamnaberg <ngar...@gmail.com> wrote: > http://help.github.com/dealing-with-lineendings/ > > On Thu, Apr 8, 2010 at 12:37 PM, Peter A Pilgrim > <peter.pilg...@gmail.com>wrote: >
Thanks Erlend I followed the help page on the github website. I hope it works going forward. I had to "git add" manually my files and folder, then "git commit", and now I wait for "git push" to finish running > > > > On 8 Apr, 01:36, Chris Phelps <cjph...@gmail.com> 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? > ===////=== > > > > >http://github.com/dickwall/ZenWriterFX/network -- You received this message because you are subscribed to the Google Groups "The Java Posse" group. To post to this group, send email to javapo...@googlegroups.com. To unsubscribe from this group, send email to javaposse+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/javaposse?hl=en.
