Sync opencraft-release/palm.1 with Upstream 20230814-1691971365 #573
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
Discussion: - openedx/wg-build-test-release#276 Co-authored-by: Edward Zarecor <[email protected]>
|
@Agrendalath Seems like I shouldn't have used a rebase when updating the previous sync branch before merging it (#569), the changes weren't picked up when scheduled action ran again, and created this PR to merge the same changes again. If its ok with you, I'll revert my previous PR merge (#569) then rerun the GH action to merge it properly (without pulling or rebasing the PR branch), and close this PR. |
|
@yusuf-musleh, sure, sounds good to me. |
yusuf-musleh
deleted the
sync-open-release/palm.master-20230814-1691971365
branch
|
@Agrendalath Done, all seems good now, reran the GH action and no new PR was created after the merge. |
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.
Syncing opencraft-release/palm.1 with Upstream
Important❗
Please always use the "Create a merge commit" option as it avoids issues when checking diffs with upstream.
Note on Conflicts⚠️
In cases of conflicts you can go ahead and resolve it here on Github if it is simple enough. However if it is a more complicated conflict please follow the steps below:
sync-open-release/palm.master-20230814-1691971365locally:opencraft-release/palm.1into that branch, make sure your[REMOTE]is pointing toopencraft-release/palm.1:sync-open-release/palm.master-20230814-1691971365to update this PRNote: Please use the "Create a merge commit" option as it avoids issues when checking diffs with upstream.