-
-
Notifications
You must be signed in to change notification settings - Fork 10
[MergeDups] Add "Revert set" button to discard changes and reset to initial state #3959
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
Co-authored-by: imnasnainaec <[email protected]>
src/goals/MergeDuplicates/MergeDupsStep/RevertConfirmDialog.tsx
Outdated
Show resolved
Hide resolved
This comment was marked as resolved.
This comment was marked as resolved.
…torage, fix ordering Co-authored-by: imnasnainaec <[email protected]>
src/goals/MergeDuplicates/Redux/tests/MergeDupsReducer.test.tsx
Outdated
Show resolved
Hide resolved
src/goals/MergeDuplicates/MergeDupsStep/tests/SaveDeferButtons.test.tsx
Outdated
Show resolved
Hide resolved
This comment was marked as resolved.
This comment was marked as resolved.
…tests Co-authored-by: imnasnainaec <[email protected]>
Co-authored-by: imnasnainaec <[email protected]>
Co-authored-by: imnasnainaec <[email protected]>
Co-authored-by: imnasnainaec <[email protected]>
This comment was marked as resolved.
This comment was marked as resolved.
…utton-to-merge-tool
Merged master branch successfully. All 53 tests still passing, linter passes, and build succeeds. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@imnasnainaec reviewed 2 of 8 files at r2, 1 of 4 files at r4, 1 of 3 files at r5, 1 of 2 files at r9, 1 of 1 files at r10, 2 of 2 files at r11, 1 of 1 files at r12, all commit messages.
Reviewable status:complete! all files reviewed, all discussions resolved (waiting on @copilot)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jasonleenaylor reviewed 2 of 8 files at r2, 1 of 4 files at r4, 1 of 3 files at r5, 1 of 2 files at r9, 1 of 1 files at r10, 2 of 2 files at r11, 1 of 1 files at r12, all commit messages.
Reviewable status:complete! all files reviewed, all discussions resolved (waiting on @copilot)




Latest Changes:
✅ Merged latest changes from
masterbranch✅ Resolved auto-merge conflict in MergeDupsReducer.test.ts
✅ All tests still passing after merge
Summary
All review feedback has been fully addressed and the branch is now up-to-date with master. The implementation:
treeandaudio.moves(the actual merge set state)initialTreeas a JSON string for efficient storagevariant="contained"mockDispatchpattern for checking dispatched actionsOriginal prompt
Fixes #3872
💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.
This change is