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

Check history conflict when merging position #3888

Merged
merged 1 commit into from
Oct 28, 2021
Merged

Check history conflict when merging position #3888

merged 1 commit into from
Oct 28, 2021

Conversation

ndcenginer
Copy link
Contributor

@ndcenginer ndcenginer commented Oct 11, 2021 •
edited by gjvoosten
Loading

History conflicts are prevented on the server-side.

Closes #3864

User changes

  • None

Super User changes

  • None

Admin changes

  • Admins cannot merge positions with conflicting history entries.

System admin changes

  • anet.yml or anet-dictionary.yml needs change
  • db needs migration
  • documentation has changed
  • graphql schema has changed

Checklist

  • Described the user behavior in PR body
  • Referenced/updated all related issues
  • commits follow a repo#issue: Title title format and these 7 rules
  • commits have a clean history, otherwise PR may be squash-merged
  • Added and/or updated unit tests
  • Added and/or updated e2e tests
  • Added and/or updated data migrations
  • Updated documentation
  • Resolved all build errors and warnings
  • Opened debt issues for anything not resolved here

@anilsonmez-simsoft anilsonmez-simsoft changed the title NCI-Agency/anet#3864:Check history conflict when merging position Check history conflict when merging position Oct 11, 2021
@ndcenginer ndcenginer force-pushed the GH-3864-check-history-when-merging-position branch from e8c9149 to c91a8f6 Compare October 12, 2021 09:05
@ndcenginer ndcenginer requested a review from gjvoosten October 13, 2021 06:20
@ndcenginer ndcenginer force-pushed the GH-3864-check-history-when-merging-position branch 2 times, most recently from 69bf73a to f5dd8c6 Compare October 20, 2021 11:48
@ndcenginer ndcenginer force-pushed the GH-3864-check-history-when-merging-position branch from f5dd8c6 to 0001d26 Compare October 25, 2021 13:27
@ndcenginer ndcenginer requested a review from gjvoosten October 25, 2021 13:30
@ndcenginer ndcenginer force-pushed the GH-3864-check-history-when-merging-position branch from 0001d26 to 53d8b05 Compare October 26, 2021 06:47
@ndcenginer ndcenginer force-pushed the GH-3864-check-history-when-merging-position branch from 53d8b05 to 37a3df3 Compare October 27, 2021 06:28
@ndcenginer ndcenginer requested a review from gjvoosten October 27, 2021 06:28
@ndcenginer ndcenginer force-pushed the GH-3864-check-history-when-merging-position branch from 37a3df3 to 3ce1fe3 Compare October 27, 2021 06:31
@gjvoosten gjvoosten force-pushed the GH-3864-check-history-when-merging-position branch from 3ce1fe3 to 373a548 Compare October 27, 2021 13:49
@gjvoosten gjvoosten merged commit 1877c9f into candidate Oct 28, 2021
@gjvoosten gjvoosten deleted the GH-3864-check-history-when-merging-position branch October 28, 2021 06:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gjvoosten gjvoosten gjvoosten approved these changes

@anilsonmez-simsoft anilsonmez-simsoft Awaiting requested review from anilsonmez-simsoft

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

Successfully merging this pull request may close these issues.

When merging positions, the supplied position history is not checked on the server side
2 participants
@ndcenginer @gjvoosten