[almighty] github merge option for almighty-core

[Pavol Pitonak]

Today Github introduced "Rebase and merge" button, see
https://github.com/blog/2243-rebase-and-merge-pull-requests

On Thu, Sep 22, 2016 at 4:25 PM, Max Rydahl Andersen <manderse at redhat.com>
wrote:

> I use the green button. Why would I not?
>
> if the PR is already rebased to master then the green button will do the
> right thing.
> if the PR contains just *one* author and many commits and the last
> comment makes sense then the green button will almost do the right thing.
>
> If the PR is not rebased to master - it will create (potentially)
> unnecessary git merges.
> If the PR has multiple good commit messages - the squash will make them
> really hard to read.
> If the PR has multiple authors - some of those authors will *not* be
> recognised as contributor.
> If you haven't tested the PR then the green button will do the wrong thing
> too ;)
>
> So yes, the big green button can be tempting and it *sometimes* works,
> but in other cases it is just wrong/bad/annoying.
>
> /max
>
> /Thomas
> On 09/22/2016 03:31 PM, Max Rydahl Andersen wrote:
>
> is this not just about the green button in github web ui ?
> The button noone should use anyway ? :)
> You can still do rebase/merges/squashes as need be on command line, right?
> /max
>
> Rebase to master, from the PR would - but then a merge back to master
> would still squash all the commits into 1 change at point of merge
> back into master. Thats how the git repo is setup at the moment, and
> seems wrong to me.
> If a feature is worked on for a few days, across the team, and then
> pushed into a single PR to merge into master, we are destroying the
> entire history of that code.
> regards,
> On 21/09/16 19:18, Max Andersen wrote:
>
> Rebase keeps history does it not ?
> Sent from my iPhone
> On 21 Sep 2016, at 18:28, Karanbir Singh <kbsingh at redhat.com
> <mailto:kbsingh at redhat.com <kbsingh at redhat.com>>> wrote:
> hi,
> I just noticed that the only merge option for almighty-core is now
> squash-and-merge, ie. we cant retain commit history for the PR's.
> Is this by design ?
>
> - --
> Karanbir Singh, Project Lead, The CentOS Project, London, UK
> Red Hat Ext. 8274455 | DID: 0044 207 009 4455
>
> /max
> http://about.me/maxandersen
> _______________________________________________
> almighty-public mailing list
> almighty-public at redhat.com
> https://www.redhat.com/mailman/listinfo/almighty-public
>
> /max
> http://about.me/maxandersen
>
> _______________________________________________
> almighty-public mailing list
> almighty-public at redhat.com
> https://www.redhat.com/mailman/listinfo/almighty-public
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listman.redhat.com/archives/almighty-public/attachments/20160926/28b6fa65/attachment.htm>