[smarthome-dev] Merge strategy

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]

[smarthome-dev] Merge strategy

From: Markus Rathgeb <maggu2810@xxxxxxxxx>
Date: Tue, 5 Apr 2016 09:45:58 +0200
Delivered-to: smarthome-dev@xxxxxxxxxxx
List-archive: <https://dev.eclipse.org/mailman/private/smarthome-dev>
List-help: <mailto:smarthome-dev-request@eclipse.org?subject=help>
List-subscribe: <https://dev.eclipse.org/mailman/listinfo/smarthome-dev>, <mailto:smarthome-dev-request@eclipse.org?subject=subscribe>
List-unsubscribe: <https://dev.eclipse.org/mailman/options/smarthome-dev>, <mailto:smarthome-dev-request@eclipse.org?subject=unsubscribe>

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

Follow-Ups:
- Re: [smarthome-dev] Merge strategy
  - From: Sebastian Janzen
- Re: [smarthome-dev] Merge strategy
  - From: Kai Kreuzer

Prev by Date: Re: [smarthome-dev] Java 8 CP2
Next by Date: Re: [smarthome-dev] Merge strategy
Previous by thread: [smarthome-dev] Java 8 CP2
Next by thread: Re: [smarthome-dev] Merge strategy
Index(es):
- Date
- Thread

Breadcrumbs