Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [smarthome-dev] Merge strategy

I also wanted to test this feature. I am not sure yet, how Github creates the commit message of the squashed commit. We must make sure that the Also-By and Signed-off footers are correct.


> On 05 Apr 2016, at 09:45, Markus Rathgeb <maggu2810@xxxxxxxxx> wrote:
> 
> Hi,
> the reason for the "squash before merge" is a clean history. Is this correct?
> WDYT using the new "squash and merge" feature that Github offers now?
> If this handles a rebase automatically and uses a ff-merge strategy,
> we can get rid off all the merge commits in our history (if this works
> as I expected the feature).
> 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



Back to the top