[SciPy-Dev] Rebase a branch that's in a pull request?

Warren Weckesser warren.weckesser@gmail....
Sun Jun 9 11:06:52 CDT 2013


On Sun, Jun 9, 2013 at 12:03 PM, Ralf Gommers <ralf.gommers@gmail.com>wrote:

>
>
>
> On Sun, Jun 9, 2013 at 5:52 PM, Warren Weckesser <
> warren.weckesser@gmail.com> wrote:
>
>> While fixing some screw ups in a pull request, I rebased my feature
>> branch on the latest master.  Can I push this back to the pull request on
>> github?  To test, I tried pushing it with the '-n' option, and got:
>>
>> To https://WarrenWeckesser@github.com/WarrenWeckesser/scipy.git
>>  ! [rejected]        bug-stats-pareto-skewness ->
>> bug-stats-pareto-skewness (non-fast-forward)
>> error: failed to push some refs to '
>> https://WarrenWeckesser@github.com/WarrenWeckesser/scipy.git'
>> hint: Updates were rejected because the tip of your current branch is
>> behind
>> hint: its remote counterpart. Merge the remote changes (e.g. 'git pull')
>> hint: before pushing again.
>> hint: See the 'Note about fast-forwards' in 'git push --help' for details.
>>
>> Is this a case where using '-f' is appropriate?
>>
>
> Yes.
>
>
>>
>> More generally, is rebasing a feature branch in a pull request an
>> acceptable part of the workflow?  So far I've tried to avoid it, but I
>> think there have been quite a few PRs that have been rebased.
>>
>
> More than acceptable, in many cases it's recommended - fixing merge
> conflicts, improving commit messages, removing unwanted commits, etc.
>
>

OK, thanks.  I've used rebase a lot locally, but I wasn't  sure about
pushing it back to a PR on github.

Warren


Ralf
>
>
>
> _______________________________________________
> SciPy-Dev mailing list
> SciPy-Dev@scipy.org
> http://mail.scipy.org/mailman/listinfo/scipy-dev
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://mail.scipy.org/pipermail/scipy-dev/attachments/20130609/47af3e54/attachment.html 


More information about the SciPy-Dev mailing list