2024 11 18 master next fix fork point #10399
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Changed recipes had more changed files than just that one made in a PR. The same issue as here: https://github.com/orgs/community/discussions/25950#discussioncomment-8236983
This reverts commit 77f50a3. This was not helpful. The issue was the "fork point" fix.
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin kirkstone-next
git worktree add -d .worktree/backport-10399-to-kirkstone-next origin/kirkstone-next
cd .worktree/backport-10399-to-kirkstone-next
git switch --create backport-10399-to-kirkstone-next
git cherry-pick -x ba472b4d11b6f885b8548fa641e353819a5f5369 d8709ac3191287dac2a13f004c86f48c23e8b6e3 |
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin scarthgap-next
git worktree add -d .worktree/backport-10399-to-scarthgap-next origin/scarthgap-next
cd .worktree/backport-10399-to-scarthgap-next
git switch --create backport-10399-to-scarthgap-next
git cherry-pick -x ba472b4d11b6f885b8548fa641e353819a5f5369 d8709ac3191287dac2a13f004c86f48c23e8b6e3 |
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin styhead-next
git worktree add -d .worktree/backport-10399-to-styhead-next origin/styhead-next
cd .worktree/backport-10399-to-styhead-next
git switch --create backport-10399-to-styhead-next
git cherry-pick -x ba472b4d11b6f885b8548fa641e353819a5f5369 d8709ac3191287dac2a13f004c86f48c23e8b6e3 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue #, if available:
Description of changes:
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.