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

Update conflict status after request to update entity data #908

Merged
merged 5 commits into from
Dec 7, 2023
Merged

Update conflict status after request to update entity data #908

merged 5 commits into from
Dec 7, 2023

Conversation

matthew-white
Copy link
Member

Closes getodk/central#556.

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

matthew-white
matthew-white commented Dec 7, 2023
View reviewed changes
Copy link
Member Author

@matthew-white matthew-white left a comment

Choose a reason for hiding this comment

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

Notes from interactive code review

src/components/entity/list.vue Outdated Show resolved Hide resolved
test/components/entity/list.spec.js Outdated Show resolved Hide resolved
@matthew-white matthew-white merged commit 4b5d237 into master Dec 7, 2023
1 check passed
@matthew-white matthew-white deleted the update-conflict branch December 7, 2023 06:53
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.

Entity detail page with the table of conflicts after resolving the conflict in a different tab
2 participants
@matthew-white @ktuite