[SciPy-Dev] git question: fetch a PR without merging into master
Fri Mar 1 15:21:59 CST 2013
On Fri, Mar 1, 2013 at 4:09 PM, Jacob Vanderplas
> Hi Warren,
> github offers a little-known cheat sheet on this: go to the bottom of the
> PR page, and click the little "i" icon next to the "This pull request can
> be automatically merged" This shows the commands to create a local branch
> on your machine and pull down changes associated with the pull request.
Thanks Jake. I use those hints a lot, but when the PR can not be merged
automatically, the 'git pull' command suggested there results in a merge
with master, and that will result in conflicts that have to be resolved.
> On Fri, Mar 1, 2013 at 1:01 PM, Warren Weckesser <
> email@example.com> wrote:
>> Hey all,
>> Does anyone have a git recipe for grabbing a pull request from github
>> without merging it into master? Ideally, I'd like to branch from the same
>> point the PR branches from master, and not merge the branch back into
>> master. The use case is to test pull requests that have merge conflicts.
>> I'd like to be able to experiment with the PR, while putting off resolving
>> the merge conflicts until later.
>> SciPy-Dev mailing list
> SciPy-Dev mailing list
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the SciPy-Dev