Pull requests: Changelog updates conflicting

[Erik Huelsmann <..hidden..>]

Hi all,

In the past I wasn't too exact in updating the changelog file. Today I thought I'd better my life and started to update the change log on all backports I created PRs for. However, once I got the procedure right, the changelog additions started to conflict.

Is there anything we can do about the current situation? Should I *not* update the changelog when merging changes? Do we want a different procedure to generate a change log file and add/commit that upon a release?

Your feedback is most welcome.

--

Bye,

Erik.

http://efficito.com -- Hosted accounting and ERP.

Robust and Flexible. No vendor lock-in.

------------------------------------------------------------------------------
Dive into the World of Parallel Programming! The Go Parallel Website,
sponsored by Intel and developed in partnership with Slashdot Media, is your
hub for all things parallel software development, from weekly thought
leadership blogs to news, videos, case studies, tutorials and more. Take a
look and join the conversation now. http://goparallel.sourceforge.net

_______________________________________________
Ledger-smb-devel mailing list
..hidden..
https://lists.sourceforge.net/lists/listinfo/ledger-smb-devel