Skip to content

Sync opencraft-release/palm.1 with Upstream 20230925-1695600184 - #589

Merged
Agrendalath merged 1 commit into
opencraft-release/palm.1from
sync-open-release/palm.master-20230925-1695600184
Sep 28, 2023
Merged

Sync opencraft-release/palm.1 with Upstream 20230925-1695600184#589
Agrendalath merged 1 commit into
opencraft-release/palm.1from
sync-open-release/palm.master-20230925-1695600184

Conversation

@opencraft-requirements-bot

Copy link
Copy Markdown

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:

  1. Check out sync-open-release/palm.master-20230925-1695600184 locally:
  2. Pull latest changes from opencraft-release/palm.1 into that branch, make sure your [REMOTE] is pointing to opencraft-release/palm.1:
git pull [REMOTE] opencraft-release/palm.1
  1. Resolve the conflicts locally, then commit the result. This will create a new merge commit.
  2. Push the new merge commit to sync-open-release/palm.master-20230925-1695600184 to update this PR
  3. Review the PR again and merge when ready!
    Note: Please use the "Create a merge commit" option as it avoids issues when checking diffs with upstream.

@Agrendalath Agrendalath left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

👍

  • I tested this: the extra fields are still retrieved from REGISTRATION_EXTRA_FIELDS in the lines above the modified ones
  • I read through the code
  • I checked for accessibility issues: n/a
  • Includes documentation: n/a
  • I made sure any change in configuration variables is reflected in the corresponding client's configuration-secure repository: n/a

@Agrendalath
Agrendalath merged commit b92baaa into opencraft-release/palm.1 Sep 28, 2023
@Agrendalath
Agrendalath deleted the sync-open-release/palm.master-20230925-1695600184 branch September 28, 2023 11:09
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.

3 participants