On 11/7/25 08:06, Mark Sapiro wrote:
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.
Also, sometimes doing a rebase on GitLab will avoid the conflict. -- 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
