| Re: [capella-dev] Bugfix workflow? |
Hey, We were using merge until last year but :
[Felix Dorner] Just merge often, not just once a month... Also, who are 99% of the authors that commit on the maintenance branches? You guys sit all in the same room, just talk to each other..
[Felix Dorner] So won’t cherry picks.
[Felix Dorner] Learn then how merges look in gerrit. First learn how they look in git, there is plenty of docs. https://haacked.com/archive/2014/02/21/reviewing-merge-commits/ https://stackoverflow.com/questions/40986518/git-show-of-a-merge-commit I’m no super expert either, but as a starter, I think if the merge looks ‘empty’, there were no conflicts. If there’s stuff, then there were conflicts, and the diff shows how these were resolved. Also, just could just fetch the change and look at it locally.. Between 1.2.x and master, there is not yet api changes, so your cherry picks will be quite easy to do. [Felix Dorner] I’m not worried about that. I’m worried about how this will work in the long term: Changes will be forgotten, there will be more regressions. Noone can tell about which changes are ported, which aren’t.. I think it’s just wrong to do it like that. Cheers, Felix From: capella-dev-bounces@xxxxxxxxxxxx [mailto:capella-dev-bounces@xxxxxxxxxxxx] On Behalf Of Felix Dorner Hey, What’s the reason for all these cherrypicks? Why don’t you just merge? This is hell… Felix |