On Mon, Jan 13, 2020 at 08:19:36AM -0600, Richard Shaw wrote: > Just catching up on this thread... > How about an incremental step? (I don't know how difficult it would be to > implement however)... This is what Vit was suggesting which seems like a very nice idea :) > What about separating the change log to a separate file in dist-git? > Something like the traditional "ChangeLog"? > I like to keep my spec files in sync between releases unless there's a > good reason for them to diverge but sometimes there are changes to a > specific release that aren't really a part of the others. > That way I can keep the spec files in sync (git merge master, et. all) but > without merging changelogs that don't actually apply to that release (and > dealing with merge conflicts)? The conflicts won't go away, it'll be moved from the .spec file to the ChangeLog file. Pierre _______________________________________________ devel mailing list -- devel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/devel@xxxxxxxxxxxxxxxxxxxxxxx