[almighty] github merge option for almighty-core

[Thomas Mäder]

I use the green button. Why would I not?

/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>> 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