On Thu, Feb 18, 2016 at 11:05 AM Florian Bruhin <[email protected]> wrote:
> FWIW, another solution would be to add some empty lines and tell > people to pick a random non-empty line: > > > https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/ +1 for this solution. Cheers, Bruno,
_______________________________________________ pytest-dev mailing list [email protected] https://mail.python.org/mailman/listinfo/pytest-dev
