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

Minor fixes for Resolve Conflict #1037

Merged
merged 4 commits into from
Nov 6, 2023
Merged

Minor fixes for Resolve Conflict #1037

merged 4 commits into from
Nov 6, 2023

Conversation

sadiqkhoja
Copy link
Contributor

@sadiqkhoja sadiqkhoja commented Oct 31, 2023 •
edited
Loading

  • Fixes: it should not resolve if resolve flag is not true
  • Fixes: set updatedAt on resolve conflict
  • Check for If-Match before resolve conflict

Before submitting this PR, please make sure you have:

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

@matthew-white matthew-white self-requested a review October 31, 2023 19:38
matthew-white
matthew-white approved these changes Nov 1, 2023
View reviewed changes
test/integration/api/entities.js Outdated Show resolved Hide resolved
This was referenced Nov 2, 2023
Closed
Closed
@sadiqkhoja sadiqkhoja merged commit a59c260 into getodk:master Nov 6, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matthew-white matthew-white matthew-white 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.
2 participants
@sadiqkhoja @matthew-white