Re: [capella-dev] Bugfix workflow?

[DUL Philippe <philippe.dul@xxxxxxxxxxxxxxx>]

Hi Felix,

 

We were using merge until last year but :

 

-          It always led to have a big merge done by one of the reviewers and not the authors of the commits.

-          There is often major API changes (like between 1.1.x and 1.2.x) so merge will not compile automatically, it is more logical to let the author and not the reviewer doing code adaptation.

-          And the reviewer of the merge is not able to see anything in the gerrit view. (As you can see https://git.polarsys.org/r/#/c/4463/ , patch is unreadable, so the reviewer must trust the merge author)

 

Between 1.2.x and master, there is not yet api changes, so your cherry picks will be quite easy to do.

 

Philippe

 

 

From: capella-dev-bounces@xxxxxxxxxxxx [mailto:capella-dev-bounces@xxxxxxxxxxxx] On Behalf Of Felix Dorner
Sent: jeudi 4 janvier 2018 18:04
To: capella-dev@xxxxxxxxxxxx
Subject: [capella-dev] Bugfix workflow?

 

Hey,

 

What’s the reason for all these cherrypicks? Why don’t you just merge? This is hell…

 

Felix