On Monday, 27 November 2017 15:18:19 PST Lubomir I. Ivanov wrote: > > Isn’t this what we are looking for: > > > > http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/ > > i think, yes. that's exactly what we are looking for. > i wonder if it would work with the current ReleaseNotes.txt layout > where lines are inserted at the bottom of a new release and on top of > old ones. i guess i can test it.
Since we're using GitHub itself to do the merges, can you confirm that it does respect this .gitattributes attribute? -- Thiago Macieira - thiago (AT) macieira.info - thiago (AT) kde.org Software Architect - Intel Open Source Technology Center _______________________________________________ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface