[pytest-dev] GitHub Issues and Pull Requests templates

[Bruno Oliveira]

On Thu, Feb 18, 2016 at 11:05 AM Florian Bruhin <me at the-compiler.org> 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,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/pytest-dev/attachments/20160218/1a158f84/attachment.html>