Fix changelog conflict with 1.1.x #186
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merged
wxtim
pushed a commit
to wxtim/cylc-rose
that referenced
this pull request
Nov 25, 2022
wxtim
added a commit
to wxtim/cylc-rose
that referenced
this pull request
Nov 25, 2022
…mental_improvements_to_testing * 'master' of github.com:cylc/cylc-rose: Remove subprocess from tests (cylc#194) update stem - install interface (cylc#193) Update tests/unit/test_rose_stem_units.py response to review Update setup.cfg removed never used option Improve test coverage for Rose Stem reinstall changes to `rose-suite.conf` [tests] (cylc#178) Changed the rose stem functional tests to a more pytest-integration style. Bump rose dependency to `2.1.*` Bump dev version on master to next minor release (cylc#175) Fix changelog conflict with 1.1.x (cylc#186) Prepare release: 1.1.1 (cylc#183) Rose Stem Fixes (cylc#172) Don't pass rose variables with state ! or !! to Cylc. (cylc#171) Don't pass rose variables with state ! or !! to Cylc. (cylc#171) Bump cylc-flow dependency (cylc#173) functional tests only cleanup if succeeded
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This seems to be the only way to resolve the conflict without inadvertently changing setup.cfg on master.
After this is merged, we can reopen #184