Re: [smarthome-dev] Merge strategy

[Markus Rathgeb <maggu2810@xxxxxxxxx>]

IMHO this looks good: "maggu2810 committed with kaikreuzer"

2016-04-05 10:13 GMT+02:00 Markus Rathgeb <maggu2810@xxxxxxxxx>:
> Hi Kai,
> I would expect that this follows the normal Git behaviour.
> But please test it and merge this one (using squash + merge):
> https://github.com/maggu2810/test-merge/pull/1
>
> 2016-04-05 10:05 GMT+02:00 Kai Kreuzer <kai@xxxxxxxxxxx>:
>> Who is the author of the squashed commit? The person that merges (and edits the comment) or the original author?
>>
>>> On 05 Apr 2016, at 10:01, Markus Rathgeb <maggu2810@xxxxxxxxx> wrote:
>>>
>>> Have a look at: https://github.com/maggu2810/smarthome/pull/1
>>> The two commits has been merged here:
>>> https://github.com/maggu2810/smarthome/commit/e3d116a2a784a88814baf86ca0b36778dfd03100
>>>
>>> The commit messages are added all in the editable text box.
>>> So the one that merge the commits, can combine all the messages
>>> (create one message of the multiple ones), no Also-by and
>>> Signed-off-by gets lost (except the merger does edit the message and
>>> removes them).
>>> _______________________________________________
>>> 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