[pytest-dev] GitHub Issues and Pull Requests templates

[Florian Bruhin]

* Florian Schulze <florian.schulze at gmx.net> [2016-02-18 13:57:01 +0100]:
> On 18 Feb 2016, at 13:20, Bruno Oliveira wrote:
> 
> >For PR:
> >
> >* where to target the PR: master vs feature branch
> >* make sure to include one or more tests
> >* add yourself to AUTHORS
> >* add a new CHANGELOG entry
> 
> CHANGELOG and AUTHORS entries easily cause merge conflicts. In a non public
> project we are currently experimenting with putting that info into the PR
> itself and the person merging the PR is responsible for updating it. With
> github this should even be possible through the web before merging, I just
> thought of that and haven't tried. So the author is still responsible for
> providing the info, but not directly in the files.

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/

(Unfortunately the updated solution with a .gitattributes file didn't
work on GitHub, last time we tried)

Florian

-- 
http://www.the-compiler.org | me at the-compiler.org (Mail/XMPP)
   GPG: 916E B0C8 FD55 A072 | http://the-compiler.org/pubkey.asc
         I love long mails! | http://email.is-not-s.ms/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://mail.python.org/pipermail/pytest-dev/attachments/20160218/7d6ca101/attachment.sig>