Re: About merging Pull Request workflow
| From: | Stanislav Malyshev | Date: | Thu, 21 May 2015 07:27:54 +0000 |
| Subject: | Re: About merging Pull Request workflow | ||
| References: | 1 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-86333@lists.php.net to get a copy of this message | ||
Hi!
> Current workflow described in
> https://wiki.php.net/vcs/gitworkflow#merge_a_pull_request
>
> Problem, git history only give info about a "merge"
If you merge from a pull, the history should contain both original
commit and the merge commit. So you know both who created the patch and
who merged it. At least for me it always did. Unless you use some
special tricks to edit the history, such as --no-commit.
> 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
You can do this but it's more work and tries to work around github
instead of using facilities it provides. I'm not sure there's a reason
for that.
--
Stas Malyshev
smalyshev@gmail.com