chore: Resolve merge conflicts for 2026.07.2 - #2244
Merged
Merged
Conversation
* fix: let AssignmentsTable resolve and report picked participants * fix: remember search-selected participants in ActivityAssignDrawer
* feat(M2-10875): update footer links from mindlogger.org to gettingcurious.com * feat(M2-10875): update hardcoded terms link in SignUpForm to gettingcurious.com * feat(M2-10875): update README link from mindlogger.org to gettingcurious.com * fix: use www.gettingcurious.com instead of apex domain
* chore: bump axios, vitest, react-router-dom, lodash-es to patched versions to resolve Dependabot alerts * fix: prevent false Save Changes prompt * fix: deep-scan dirtyFields to avoid false Save Changes prompt after undo * fix: use hasFormChanges instead of isDirty in sendRequestWithPasswordCheck * fix: tests
|
This pull request is automatically being deployed by Amplify Hosting (learn more). |
adeiji
self-requested a review
July 21, 2026 23:49
adeiji
approved these changes
Jul 21, 2026
adeiji
left a comment
adeiji
left a comment
Contributor
There was a problem hiding this comment.
Took a look at the merge commit and it looks good
Contributor
Author
|
The squash commit from this PR did not allow GitHub to resolve merge conflicts in #2243. I ended up merging |
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.
This resolves merge conflicts in #2243 in preparation for release 2026.07.2. The merge conflicts arose from our use of a
release/2026.07.1branch for release 2026.07.1.