On 2020-04-17 06:29, FRANEY, JOHN J wrote: --[cut]-- > */[FRANEY, JOHN J] Cherry-picking has its uses and its limits. Are > merges, if appropriate, allowed?/* --[/cut]--
The Gerrit system is configured to disallow merge changes being pushed to it. This is by design as disallowing these sort of changes keeps the repository history cleaner as well as enforcing proper validation of all changes in a patch set. When you see a merge in repository history that is from Gerrit itself as it will automatically do a merge if it has to. Our default for repositories is to do a fast-forward merge when possible and a standard merge when not during patch submission (that is a committer pressing the Submit button after all votes are passing). -Andy- -- Andrew J Grimberg Manager Release Engineering The Linux Foundation -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#20725): https://lists.onap.org/g/onap-discuss/message/20725 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
