Re:Collaborating with LaTeX and git
by JoachimSchipper on Saturday November 24, 2012 @04:41AM
(#4824990)
Isn't the usual solution to institute a one-sentence-per-line policy? The big win is, indeed, that this allows easy patching/merging/...
Here's a StackExchange thread discussing possible solutions for finer-grained patching: http://stackoverflow.com/questions/5587626/git-merging-withi...