On 2020-04-17 11:28, FRANEY, JOHN J wrote: > Thanks Andrew, > > I doubt that I am understanding correctly. Git was designed specifically > around quick efficient frequent merging. Really. Easy merging is the > primary goal of git's design. > > And gerrit disallows merges? > > sad. ☹ (Isn't distributed software development difficult enough?)
Our configuration (and the default configuration of Gerrit) disallow merge commit changes to be proposed. It's something that can be enabled but it breaks the workflow that Gerrit is striving for in that a single change, or even patches (series of different changes that depend upon each other) are well reviewed and if CI is hooked up (as is the case with ONAP) that _no_ single change when merged should cause a break (thought without running a CI system like Zuul we can't guarantee that any particular merge order will _not_ break). So, what I'm saying is this: You, me, anyone, cannot propose a change that consists of a merge of changes. What you can propose is a single change, or series of changes that depend on each other that when all validation has passed and a committer 'submits' the change may either be a fast-forward merge, or a standard merge. Basically, we disallow you to push something that is specifically a merge commit object. -Andy- -- Andrew J Grimberg Manager Release Engineering The Linux Foundation -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#20728): https://lists.onap.org/g/onap-discuss/message/20728 Mute This Topic: https://lists.onap.org/mt/73054581/21656 Group Owner: [email protected] Unsubscribe: https://lists.onap.org/g/onap-discuss/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
signature.asc
Description: OpenPGP digital signature
