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

Return correct response for conflict after multiple prior resolutions #1054

Merged
merged 1 commit into from
Dec 5, 2023
Merged

Return correct response for conflict after multiple prior resolutions #1054

merged 1 commit into from
Dec 5, 2023

Conversation

matthew-white
Copy link
Member

Resolves the following comment: getodk/central#505 (comment)

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 requested a review from ktuite December 4, 2023 23:22
@matthew-white matthew-white merged commit e7e5ead into master Dec 5, 2023
5 checks passed
@matthew-white matthew-white deleted the multiple-resolutions branch December 5, 2023 04:28
@matthew-white matthew-white linked an issue Dec 7, 2023 that may be closed by this pull request
Summary box with conflicts after resolving the conflict in a different tab getodk/central#555
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ktuite ktuite ktuite 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.

Summary box with conflicts after resolving the conflict in a different tab
2 participants
@matthew-white @ktuite