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.

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

Show entity.update.resolve events in entity feed #887

Merged
merged 1 commit into from
Nov 1, 2023

Conversation

matthew-white
Copy link
Member

Closes getodk/central#534.

What has been done to verify that this works as intended?

I viewed it locally and wrote new tests.

Why is this the best possible solution? Were any other approaches considered?

I tried to follow existing patterns.

Before submitting this PR, please make sure you have:

  • run npm run test and npm run lint and confirmed all checks still pass OR confirm CircleCI build passes
  • verified that any code or assets from external sources are properly credited in comments or that everything is internally sourced

Copy link
Contributor

@sadiqkhoja sadiqkhoja left a comment

Choose a reason for hiding this comment

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

Looks good!

@matthew-white matthew-white merged commit c36f4f6 into master Nov 1, 2023
1 check passed
@matthew-white matthew-white deleted the resolve-entry branch November 1, 2023 15:46
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.

Show conflict resolution events in entity feed
2 participants