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

[FIX] Edit Domain: Preserve renames on categories merge #5072

Merged
merged 2 commits into from
Nov 6, 2020

Conversation

ales-erjavec
Copy link
Contributor

Issue

Fixes gh-5067

Description of changes

Do not reset the edit state when merging.

Includes
  • Code changes
  • Tests
  • Documentation

@codecov
Copy link

codecov bot commented Nov 6, 2020

Codecov Report

Merging #5072 into master will increase coverage by 0.10%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #5072      +/-   ##
==========================================
+ Coverage   84.64%   84.75%   +0.10%     
==========================================
  Files         285      286       +1     
  Lines       59579    60036     +457     
==========================================
+ Hits        50429    50881     +452     
- Misses       9150     9155       +5     

@ales-erjavec ales-erjavec changed the title Fixes/domain edit merge [FIX] Edit Domain: Preserve renames on categories merge Nov 6, 2020
@ajdapretnar ajdapretnar merged commit 29e992f into biolab:master Nov 6, 2020
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.

Edit Domain: previous edits reset when merging values
2 participants