Re: [smarthome-dev] Merge strategy

[Markus Rathgeb <maggu2810@xxxxxxxxx>]

We agree.

Perhaps the commit creator (I assume at least you and me) could point
out if separated the commits in the PR and suggests to keep it
un-squashed.

2016-10-09 21:23 GMT+02:00 Kai Kreuzer <kai@xxxxxxxxxxx>:
> New Github features all the time… Yeah, I also noticed the new option (when merging 2280) and thought about using it.
> In cases like 2280 where the commits are clearly structured and make sense each on their own, I would agree that we should use it.
> In all other cases, we should imho stay with the squashing.
>
> So for me, I am ok to leave the decision to the committer who merges a PR. Shall we agree on this?
>
> Regards,
> Kai
>
>
>> On 9 Oct 2016, at 11:01, Markus Rathgeb <maggu2810@xxxxxxxxx> wrote:
>>
>> Hi guys,
>>
>> there are now (for a while now) three merge options:
>> * Create a merge commit
>> * Squash and merge
>> * Rebase and merge
>>
>> IIRC the last one has not been available on our previous discussion.
>>
>> Normally we are using "Squash and merge" now all the time.
>>
>> If a developer splits its commits of a branch into separate commits it
>> is sometimes useful (IMHO) to keep that commits separate. They could
>> be all independent of the other but all be related to the same topic.
>>
>> E.g. https://github.com/eclipse/smarthome/pull/2280
>> All the commits fixes the D-Bus transport bundle but every commit
>> fixes different independent stuff.
>>
>> Should we consider using "Rebase and merge" for PRs like this?
>>
>> Best regards,
>> Markus
>> _______________________________________________
>> smarthome-dev mailing list
>> smarthome-dev@xxxxxxxxxxx
>> To change your delivery options, retrieve your password, or unsubscribe from this list, visit
>> https://dev.eclipse.org/mailman/listinfo/smarthome-dev
>
> _______________________________________________
> smarthome-dev mailing list
> smarthome-dev@xxxxxxxxxxx
> To change your delivery options, retrieve your password, or unsubscribe from this list, visit
> https://dev.eclipse.org/mailman/listinfo/smarthome-dev