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

Fix non-root ConfigTree merge onto root ConfigTree #156

Merged
merged 2 commits into from
May 4, 2018
Merged

Fix non-root ConfigTree merge onto root ConfigTree #156

merged 2 commits into from
May 4, 2018

Conversation

aalba6675
Copy link
Contributor

When merging a non-root ConfigTree onto a root ConfigTree create history of element if it does not exist.

@coveralls
Copy link

coveralls commented May 3, 2018 •
edited
Loading

Coverage Status

Coverage increased (+0.005%) to 97.924% when pulling 2385cf9 on aalba6675:fix-non-root into 9ca1bf4 on chimpler:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.2%) to 97.68% when pulling 15e2c86 on aalba6675:fix-non-root into 9ca1bf4 on chimpler:master.

2 similar comments
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.2%) to 97.68% when pulling 15e2c86 on aalba6675:fix-non-root into 9ca1bf4 on chimpler:master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.2%) to 97.68% when pulling 15e2c86 on aalba6675:fix-non-root into 9ca1bf4 on chimpler:master.

@aalba6675 aalba6675 force-pushed the fix-non-root branch 2 times, most recently from e2d0711 to 0d2fd86 Compare May 3, 2018 09:22
darthbear
darthbear approved these changes May 4, 2018
View reviewed changes
Copy link
Member

@darthbear darthbear left a comment

Choose a reason for hiding this comment

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

Thank you @aalba6675 ! LGTM

@darthbear darthbear merged commit f039370 into chimpler:master May 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@darthbear darthbear darthbear 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.
3 participants
@aalba6675 @coveralls @darthbear