Re: [smarthome-dev] Merge strategy

[Markus Rathgeb <maggu2810@xxxxxxxxx>]

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