Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rootless-install: Add spacing to limit merge conflicts #404

Merged
merged 1 commit into from
Mar 20, 2024

Conversation

vvoland
Copy link
Contributor

@vvoland vvoland commented Mar 20, 2024

Assign CHANNEL variable between STABLE_LATEST and TEST_LATEST to
spread them apart so they don't appear in diff.

This allows to limit merge conflicts when there are two separate PRs
that update one of the versions.

Assign `CHANNEL` variable between `STABLE_LATEST` and `TEST_LATEST` to
spread them apart so they don't appear in diff.

This allows to limit merge conflicts when there are two separate PRs
that update one of the versions.

Signed-off-by: Paweł Gronowski <[email protected]>
@vvoland vvoland self-assigned this Mar 20, 2024
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah thaJeztah merged commit bc797cc into docker:master Mar 20, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants