[SciPy-Dev] Used "Automatic Merge" on my github pull request...

[Ralf Gommers]

On Sun, May 22, 2011 at 7:51 AM, Warren Weckesser <
warren.weckesser at enthought.com> wrote:

> I used the "Automatic merge" button on my own pull request on github, but
> afterwards discovered that it uses --no-ff, so my single commit also
> resulted in a "merge" commit:
>
> https://github.com/scipy/scipy/commit/cf04a2b8dd4cf258413687ec146883ea5ab197cb
>
> Should I try to get rid of that merge?  If so, how?  (The git book is by my
> side, but I suspect an answer will show up here faster than I can find it.)
>

No, it's public now so you shouldn't touch it anymore.

That button is very pointless - best to ignore it.

Ralf
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.python.org/pipermail/scipy-dev/attachments/20110522/8a367c2e/attachment.html>