Re: [smarthome-dev] Merge strategy

[Kai Kreuzer <kai@xxxxxxxxxxx>]

Hm, right, by not having a merge commit anymore, we are losing the automatic references to the PRs, what is not nice.

I think it is therefore important to manually add the reference in the commit message, yes.
Should this be done by the author or the committer?
We would need to update the contributing documentation before we switch to this new mode. It probably also makes sense to do the same process changes in openHAB, so that contributors from there are not confused about what style has to be done where.


> Am 05.04.2016 um 10:47 schrieb Markus Rathgeb <maggu2810@xxxxxxxxx>:
> 
> We already have a something similar to this one in the commit message:
> Bug: https://github.com/eclipse/smarthome/issues/12345
> As the person that applies the merge no is able to edit the commit
> message should we add something similar to:
> PR: https://github.com/eclipse/smarthome/pull/54321
> to have a nice reference in the commit message?
> IMHO it is surely not a must, but (as we could do it now easily) a
> nice feature to have a reference to some further documentation /
> discussion (if someone needs more information about a commit).
> 
> 2016-04-05 10:17 GMT+02:00 Kai Kreuzer <kai@xxxxxxxxxxx>:
>> In the git log itself it is:
>> 
>> Author: Markus Rathgeb <maggu2810@xxxxxxxxx>
>> Date: 5 April 2016 at 10:13:38 GMT+2
>> Committer: Kai Kreuzer <kai@xxxxxxxxxxx>
>> 
>> And we do not have a separate merge commit anymore.
>> It looks good to me, I think we can go with that - it definitely makes life easier for beginners as they don’t have to squash themselves anymore.
>> 
>>> On 05 Apr 2016, at 10:14, Markus Rathgeb <maggu2810@xxxxxxxxx> wrote:
>>> 
>>> 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
>>> _______________________________________________
>>> 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
> _______________________________________________
> 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