Enable "allow content merges" for submit |
|||
Issue description> Using Rebase UI option works just fine. > So, can Submit operation learn from Rebase operation and do the > right thing automatically? Rebase in the UI is always doing a content merge, submit only does a content merge if it is configured [1]. [1] https://gerrit-review.googlesource.com/Documentation/project-configuration.html#content_merge I think for Rietveld we are doing essentially content merge in CQ right now. Also, bot_update rebases gerrit patch. So maybe we should enable content_merge in submits for Chromium and other projects migrating from Rietveld to Gerrit. See also internal b/31970251
,
Oct 12 2016
Yes, we should enable "Allow content merges" so that 'submit' in the Gerrit UI most closely mirrors the current usage of "git cl land" for Rietveld.
,
Oct 31 2016
I've enabled this on https://chromium-review.googlesource.com/#/admin/projects/infra hence infra/infra should not require this any more.
,
Jan 13 2017
Yes, we should enable content merge on submit. It is a safe setting for our use cases, and most closely mirrors the current Rietveld+CQ behavior. To resolve this bug (with new title) I need to: a) Audit all current fishfood repos to make sure they have this setting allowed; and b) Add the setting to the template I use for upcoming onboardings.
,
Feb 22 2017
|
|||
►
Sign in to add a comment |
|||
Comment 1 by tandrii@chromium.org
, Oct 12 2016Labels: Milestone-Launch