Bring tag to develop from master #1967
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
Armory 0.17.0 release candidate
this was causing new git clones to be dirty immediately after cloning. soooo weird! (msw & cjw)
removed tools/run_scenario_configs.sh
Armory v0.17.2 release
Armory v0.18.0 release candidate
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.
There was a setuptools_scm unhappiness because the v0.18.0 tag lived on master but not develop.
Because a tag applies to one specific commit, merging master into develop gets the tagged commit into branch develop thus allowing work on that branch to see v0.18.0
This happened because I forgot to merge master→develop, and then forgot that I forgot. 😢