On 11/6/25 23:52, Stephen J. Turnbull wrote:
For the ones that change user visible behavior, how do we handle the NEWS? In general, if you include a NEWS item in the MR commit, you're likely to get a conflict since they're normally added in the same place. Is that not a consideration for Mailman? Or do we just update the MR and try again?
I handle it by doing the merge in a local branch, resolving the conflict and pushing back to GitLab.
It is also possible to resolve the conflict directly on GitLab, but I don't do that IIRC because it adds an extra commit for the conflict resolution.
-- Mark Sapiro <[email protected]> The highway is for gamblers, San Francisco Bay Area, California better use your sense - B. Dylan _______________________________________________ Mailman-Developers mailing list -- [email protected] To unsubscribe send an email to [email protected] https://mail.python.org/mailman3/lists/mailman-developers.python.org/ Mailman FAQ: https://wiki.list.org/x/AgA3 Security Policy: https://wiki.list.org/x/QIA9
