Sync opencraft-release/palm.1 with Upstream 20230807-1691366566 - #569
Merged
yusuf-musleh merged 1 commit intoAug 10, 2023
Conversation
|
@Agrendalath This PR looks fine to me, just wanted to check if I should I go ahead and update/merge it? |
Agrendalath
approved these changes
Aug 10, 2023
Agrendalath
left a comment
Agrendalath
left a comment
Member
There was a problem hiding this comment.
@yusuf-musleh, sure, feel free to merge this.
Discussion: - openedx/wg-build-test-release#276 Co-authored-by: Edward Zarecor <ezarecor@tcril.org>
yusuf-musleh
force-pushed
the
sync-open-release/palm.master-20230807-1691366566
branch
from
August 10, 2023 14:21
085987e to
448295f
Compare
yusuf-musleh
deleted the
sync-open-release/palm.master-20230807-1691366566
branch
August 10, 2023 15:02
This was referenced Aug 14, 2023
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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-20230807-1691366566locally:opencraft-release/palm.1into that branch, make sure your[REMOTE]is pointing toopencraft-release/palm.1:sync-open-release/palm.master-20230807-1691366566to update this PRNote: Please use the "Create a merge commit" option as it avoids issues when checking diffs with upstream.