About merging Pull Request workflow
| From: | Remi Collet | Date: | Thu, 21 May 2015 07:16:31 +0000 |
| Subject: | About merging Pull Request workflow | ||
| Groups: | php.internals | ||
| Request: | Send a blank email to internals+get-86331@lists.php.net to get a copy of this message | ||
-----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-----