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

CP 3.9 Fixes #36966, #36896, #36963 UI fixes #9947

Merged
merged 3 commits into from
Dec 19, 2023

Conversation

MariaAga
Copy link
Member

@MariaAga MariaAga commented Dec 7, 2023

No description provided.

@MariaAga MariaAga added the Stable branch PRs that are opened against a stable branch. Usually a cherry pick label Dec 7, 2023
@github-actions github-actions bot added the UI label Dec 7, 2023
@MariaAga MariaAga requested a review from ekohl December 14, 2023 07:16
Copy link
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

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

Actually, please cherry pick the real commits that were merged. Because of GitHub's way of merging the commit sha changes. So the "Cherry picked from" SHAs don't resolve in a normal repository.

@MariaAga
Copy link
Member Author

@ekohl what are the "real commits" and where do I find them?

Copy link
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

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

Disregard that, I was confused by the GH UI. Somehow MariaAga@be98675 didn't show as being in develop but it really is.

Shame I didn't see this earlier (because I was on vacation) and nobody else did either. Now it missed 3.9.0 GA.

@ekohl ekohl merged commit ba4b1da into theforeman:3.9-stable Dec 19, 2023
15 of 16 checks passed
@ekohl
Copy link
Member

ekohl commented Dec 20, 2023

Ok, so I wasn't blind and those commits do indeed only live in your fork. Not in develop itself. For next time, the process is to pull the develop branch and use the commit IDs there, not from the PR you made.

We should have documentation on this, but I'm not aware of any that we have today.

@MariaAga
Copy link
Member Author

I use your comment from here as documentation 😅 https://community.theforeman.org/t/update-stable-branch-workflows/34136/2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Stable branch PRs that are opened against a stable branch. Usually a cherry pick UI Waiting on contributor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants