Re: [smarthome-dev] Merge strategy

[Markus Rathgeb <maggu2810@xxxxxxxxx>]

I will test this feature (private repo) and report here.
Wait a moment.

2016-04-05 9:50 GMT+02:00 Sebastian Janzen <sebastian.janzen@xxxxxxxxx>:
> +1, would be really great.
> But I thing this is in conflict with signign our commits. Am I right?
>
>
> Am 05.04.2016 um 09:45 schrieb Markus Rathgeb <maggu2810@xxxxxxxxx>:
>
> 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
>
>
> Sebastian Janzen, sebastian.janzen@xxxxxxxxx, http://www.innoq.com
> innoQ Deutschland GmbH, Krischerstr. 100, 40789 Monheim, Germany
> Phone: +49 2173 3366 0  Mobile: +49 151 53542783  Fax: +49 2173 3366 222
>
>
> _______________________________________________
> 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