Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix clearing fields in merge edits #904

Merged
merged 1 commit into from
Jan 24, 2025
Merged

Fix clearing fields in merge edits #904

merged 1 commit into from
Jan 24, 2025

Conversation

peolic
Copy link
Contributor

@peolic peolic commented Jan 10, 2025 •
edited
Loading

Fixes #903, by applying the same fix to MERGE edits, as #677 did for MODIFY edits.

  • Tested only on performers merges, trying to remove disambiguation from the merge target.
  • Need to look into adding tests, like in Fix clearing entity fields in edits #677?
    it seems I don't have any patience to do this

@peolic peolic marked this pull request as ready for review January 22, 2025 16:23
InfiniteStash
InfiniteStash approved these changes Jan 24, 2025
View reviewed changes
Copy link
Collaborator

@InfiniteStash InfiniteStash left a comment

Choose a reason for hiding this comment

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

I don't blame you for not writing tests, it's entirely too much boilerplate at the moment. I need to rewrite them to be faster to set up, but dealing with tests is the most boring thing in the world...

Anyway, thanks!

@InfiniteStash InfiniteStash merged commit 2fb6b66 into stashapp:master Jan 24, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@InfiniteStash InfiniteStash InfiniteStash approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Clearing fields in merge edits
2 participants
@peolic @InfiniteStash