ReleaseNotes.txt and merge conflicts

[Robert Helling]

Hi,


> On 28. Nov 2017, at 03:48, Dirk Hohndel <dirk at hohndel.org> wrote:
> 
> We should try this - but in a simpler way. Have an actual Changelog style file instead of the current format.
> So change ReleaseNotes.txt to simply say "As of v4.7.5 we are tracking the changes in the Changelog file"
> I can come up with a way to add the version markers in the Changelog file automatically at release time.
> And if I feel ambitious, I can even copy things over
> 
> Thanks for figuring this out, Lubomir!

so, how are we supposed to write those now? A simple hack would of course be to actually have a folder release_notes where everybody add _files_ for things to report and then for a release we cat all those files…

Best
Robert
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20171128/066a6d25/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 529 bytes
Desc: Message signed with OpenPGP
URL: <http://lists.subsurface-divelog.org/pipermail/subsurface/attachments/20171128/066a6d25/attachment.sig>