W3C home > Mailing lists > Public > public-automotive@w3.org > November 2019

Re: Merge vs. Rebase

From: <Adnan.Bekan@bmwgroup.com>
Date: Wed, 6 Nov 2019 12:14:17 +0000
To: <ulfbjorkengren@geotab.com>, <Daniel.DW.Wilms@bmw.de>
CC: <public-automotive@w3.org>
Message-ID: <12C5BE5A-C714-4020-BA4F-0E552DD9BC70@bmwgroup.com>


BMW Group
Adnan Bekan
Research, New Technologies, Innovations
E/E Architecture, Technologies (LT-3)
IoT and Software Technologies

Parkring 19, 85748 Garching

Telefon: +49-89-382-56368
Mobile: +49-151-601-56368
Mail: adnan.bekan@bmwgroup.com<mailto:adnan.bekan@bmwgroup.com>
Web: http://www.bmwgroup.com<http://www.bmwgroup.com/>
Bayerische Motoren Werke Aktiengesellschaft
Vorstand/Board of Management: Oliver Zipse (Vorsitzender/Chairman),
Klaus Fröhlich, Ilka Horstmeier, Milan Nedeljković,
Pieter Nota, Nicolas Peter, Andreas Wendt.
Vorsitzender des Aufsichtsrats/Chairman of the Supervisory Board: Norbert Reithofer
Sitz und Registergericht/Domicile and Court of Registry: München HRB 42243

From: Ulf Bjorkengren <ulfbjorkengren@geotab.com>
Date: Wednesday, 6. November 2019 at 13:13
To: Daniel Wilms <Daniel.DW.Wilms@bmw.de>
Cc: public-automotive <public-automotive@w3.org>
Subject: Re: Merge vs. Rebase
Resent-From: <public-automotive@w3.org>
Resent-Date: Wednesday, 6. November 2019 at 13:13

I support it too.

On Wed, Nov 6, 2019 at 1:08 PM <Daniel.DW.Wilms@bmw.de<mailto:Daniel.DW.Wilms@bmw.de>> wrote:

I’m afraid, that Gunnars comment on Ulf’s PR gets lost, so I’ll post it here, as I strongly support the request:

I would like to propose, if the group accepts, that rebase (the option named rebase-and-merge in GitHub) is preferred over the merge option. Otherwise we end up in situations like the above, where the pull request itself has some local merges (how?), and basically 3 of the PR commits are merges themselves. This PR really only has 3 commits that propose new content, and 3 "useless" merge commits. It is messy and IMHO the commit content matters, but the PR references you get from a merge commit are only useful to keep while reviewing, and then immediately obsolete.

I think rebase is the much better option and I would change it in the github settings as the preferred methods, if there are no objections.

Beste Grüße / Best regards,

BMW Technology Office Israel
Daniel Wilms
Research Engineer

phone: +972 54 34 20 806
mail: daniel.dw.wilms@bmwgroup.com<mailto:daniel.dw.wilms@bmwgroup.com>

postal address:
BMW Technology Office Israel Ltd
121 Menachem Begin Road
LABS Mailbox numbers: 93-95
Tel Aviv
Israel 8067318

Ulf Bjorkengren


Senior Connectivity Strategist | Ph. D.


+45 53562142



[Image removed by sender.]

Join us at Connect 2020

San Diego

January 13 - 16, 2020

Register Now!<https://www.geotab.com/connect/>

Received on Wednesday, 6 November 2019 12:29:48 UTC

This archive was generated by hypermail 2.4.0 : Friday, 17 January 2020 19:06:14 UTC