Skip to content

Switch from merge-resolve(default) to merge mode for containerd-build-arm64#5170

Merged
dmcgowan merged 1 commit intocontainerd:masterfrom
dims:switch-zuul-merge-mode
Mar 11, 2021
Merged

Switch from merge-resolve(default) to merge mode for containerd-build-arm64#5170
dmcgowan merged 1 commit intocontainerd:masterfrom
dims:switch-zuul-merge-mode

Conversation

@dims
Copy link
Copy Markdown
Member

@dims dims commented Mar 11, 2021 •
edited
Loading

Just use the same default merge mode as github, don't use the conservative thing zuul defaults to. More info at:
https://zuul-ci.org/docs/zuul/reference/project_def.html

project.merge-mode
Default: merge-resolve

merge
Uses the default git merge strategy (recursive). This maps to the merge mode merge in Github.

merge-resolve
Uses the resolve git merge strategy. This is a very conservative merge strategy which most closely matches the behavior of Gerrit. This maps to the merge mode merge in Github.

Signed-off-by: Davanum Srinivas [email protected]

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Mar 11, 2021

Build succeeded.

mikebrow
mikebrow approved these changes Mar 11, 2021
View reviewed changes
Copy link
Copy Markdown
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@dmcgowan dmcgowan merged commit d8208e2 into containerd:master Mar 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dmcgowan dmcgowan dmcgowan approved these changes

@mikebrow mikebrow mikebrow approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@dims @dmcgowan @mikebrow