Hi, > -----Original Message----- > From: Remi Collet [mailto:r...@fedoraproject.org] > Sent: Thursday, May 21, 2015 9:17 AM > To: internals@lists.php.net > Subject: [PHP-DEV] About merging Pull Request workflow > > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Hi, > > > Current workflow described in > https://wiki.php.net/vcs/gitworkflow#merge_a_pull_request > > Problem, git history only give info about a "merge" > > Ex, after merging 1278: > > http://git.php.net/?p=php- > src.git;a=commit;h=eef762d576e7744d6e0c8d6a3f997fe911b2dc34 > > Another simple workflow could be > > 1/ Download the patch > https://github.com/php/php-src/pull/1278.patch > > 2/ apply it > git am 1278.patch > > 3/ close the PR from > https://qa.php.net/pulls > > This preserve credits to the authors and give a better history. > > What do you think ? > > > Remi > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v2 > Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ > > iEYEARECAAYFAlVdhk8ACgkQYUppBSnxahhKuACfbXzDxPsZJTyfwLtyoTALPVhs > dbUAn2kk9vlD//ZQvea5Me1KU2JMgjdQ > =1Xi5 > -----END PGP SIGNATURE----- > > -- > PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: > http://www.php.net/unsub.php
Even more would make sense to do a rebase so the commits from the PR are put on the top of the branch. Not sure "git am" would trigger that. When one could avoid the merge commit, the history were of course cleaner. I never looked inside that merge mechanics, but in general - such an automation, say when you only need to merge and the PR is marked automatically, is probably a good thing. Well, sometimes it fails but for that we've that special tool. Regards Anatol -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
