Used "Automatic Merge" on my github pull request...
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/cf04a2b8dd4cf258413687ec146883ea5ab197... 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.) Warren
On Sun, May 22, 2011 at 7:51 AM, Warren Weckesser < warren.weckesser@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/cf04a2b8dd4cf258413687ec146883ea5ab197...
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
On Sun, May 22, 2011 at 2:49 AM, Ralf Gommers <ralf.gommers@googlemail.com> wrote:
That button is very pointless - best to ignore it.
For those who might not have noticed (like me - https://github.com/blog/843-the-merge-button#comment-12116), the little 'i' icon on the left still has the old 3-step copy/paste instructions so you can do the merge locally with proper testing without having to manually type all the proper git commands. That auto-merge button may be useful for multi-commit requests (where --no-ff is typically what you want to keep them grouped) that happen to be all documentation so you're fine not running the test suite locally. But the notion of auto-merging stuff without testing it at all isn't very nice. And if you have it merged locally and ran the tests, then you can just push. So in summary, follow Ralf's advice :) f
participants (3)
-
Fernando Perez -
Ralf Gommers -
Warren Weckesser