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 yaml merging when an override is defined in the same file as the source. #14090

Merged
merged 2 commits into from Oct 6, 2017

Conversation

Projects
None yet
3 participants
@pchote
Member

pchote commented Sep 30, 2017

Fixes #14060.

@pchote pchote added this to the Next + 1 milestone Sep 30, 2017

@pchote pchote requested a review from RoosterDragon Sep 30, 2017

Show outdated Hide outdated OpenRA.Game/MiniYaml.cs Outdated
@RoosterDragon

👍 Tests make things so much easier to fathom - I love tests. :)

@pchote

This comment has been minimized.

Show comment
Hide comment
@pchote

pchote Sep 30, 2017

Member

Updated.

Member

pchote commented Sep 30, 2017

Updated.

@reaperrr reaperrr merged commit d170262 into OpenRA:bleed Oct 6, 2017

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@pchote pchote deleted the pchote:fix-duplicate-node-merging branch Oct 15, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment