On 06/12/2019 18.21, Rasmus Munk Larsen wrote:
Ideally I'd like to be able to choose for each MR. FF for simple fixes,
merge for a new large feature with its own history. Since the former are
much more frequent that the later, I'm leaning toward FF by default. I'm
not sure what the semi-linear-Merge really does in practice.
This is what we used to do for TensorFlow on github when we were still
merging manually IIRC. There was a dropdown menu to choose the type of
merge.
Yes, on github this is possible (also, it is possible to choose the
standard option once, but still have a drop-down for each MR).
gitlab seems to prefer consistency over flexibility here.
Christoph
gael
Cheers,
Christoph
On 05/12/2019 22.25, Gael Guennebaud wrote:
On Thu, Dec 5, 2019 at 6:22 PM Martin Pecka <[email protected]> wrote:
There has to be a better way to configure this. A random project like
https://gitlab.com/EDN2019/componentes/merge_requests allows me to see
the MRs although I'm not a member.
Indeed. Now everyone can submit MR, just like everyone was already
allowed
to submit bugs.
gael
--
Dr.-Ing. Christoph Hertzberg
Besuchsadresse der Nebengeschäftsstelle:
DFKI GmbH
Robotics Innovation Center
Robert-Hooke-Straße 5
28359 Bremen, Germany
Postadresse der Hauptgeschäftsstelle Standort Bremen:
DFKI GmbH
Robotics Innovation Center
Robert-Hooke-Straße 1
28359 Bremen, Germany
Tel.: +49 421 178 45-4021 <+49%20421%20178454021>
Zentrale: +49 421 178 45-0
E-Mail: [email protected]
Weitere Informationen: http://www.dfki.de/robotik
-------------------------------------------------------------
Deutsches Forschungszentrum für Künstliche Intelligenz GmbH
Trippstadter Straße 122, D-67663 Kaiserslautern, Germany
Geschäftsführung:
Prof. Dr. Antonio Krüger (Vorsitzender)
Dr. Walter Olthoff
Vorsitzender des Aufsichtsrats:
Dr. Gabriël Clemens
Amtsgericht Kaiserslautern, HRB 2313
-------------------------------------------------------------
--
Dr.-Ing. Christoph Hertzberg
Besuchsadresse der Nebengeschäftsstelle:
DFKI GmbH
Robotics Innovation Center
Robert-Hooke-Straße 5
28359 Bremen, Germany
Postadresse der Hauptgeschäftsstelle Standort Bremen:
DFKI GmbH
Robotics Innovation Center
Robert-Hooke-Straße 1
28359 Bremen, Germany
Tel.: +49 421 178 45-4021
Zentrale: +49 421 178 45-0
E-Mail: [email protected]
Weitere Informationen: http://www.dfki.de/robotik
-------------------------------------------------------------
Deutsches Forschungszentrum für Künstliche Intelligenz GmbH
Trippstadter Straße 122, D-67663 Kaiserslautern, Germany
Geschäftsführung:
Prof. Dr. Antonio Krüger (Vorsitzender)
Dr. Walter Olthoff
Vorsitzender des Aufsichtsrats:
Dr. Gabriël Clemens
Amtsgericht Kaiserslautern, HRB 2313
-------------------------------------------------------------
