Hi, Just a quick warning:
Do not use the online merge conflict resolver of GitLab. It can break your remote copy of the repository in a way that you can't fix yourself. And it looks like GitLab staff is not actually helping... I broke my Postorius remote https://gitlab.com/gitlab-com/support-forum/issues/1114 be careful, Simon _______________________________________________ Mailman-Developers mailing list Mailman-Developers@python.org https://mail.python.org/mailman/listinfo/mailman-developers Mailman FAQ: http://wiki.list.org/x/AgA3 Searchable Archives: http://www.mail-archive.com/mailman-developers%40python.org/ Unsubscribe: https://mail.python.org/mailman/options/mailman-developers/archive%40jab.org Security Policy: http://wiki.list.org/x/QIA9