Adding a branch alias on dev-master#8
Open
moufmouf wants to merge 1 commit into
Open
Conversation
The development version is on the master branch. But your repository has a "master" and a "1.x" branch. As it turns out, the 1.x branch is "behind" the currently tagged branch that all come from "master". I was currently trying to get the fixes from brain-diminished#7 in TDBM. I updated my composer.json like this: ``` "brain-diminished/schema-version-control": "^1.0.5", ``` Since there is no 1.0.5 version tagged yet, I thought it would fallback to dev-master, but it actually picked the 1.x branch (which is late). This PR adds a "branch-alias" (https://getcomposer.org/doc/articles/aliases.md#branch-alias) to composer.json so that "master" branch becomes the dev branch of 1.0.x releases. In parallel of merging this, I think you should completely delete the 1.X branch.
Owner
|
Sorry for the delay, I just returned from holidays! |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The development version is on the master branch.
But your repository has a "master" and a "1.x" branch.
As it turns out, the 1.x branch is "behind" the currently tagged branch that all come from "master".
I was currently trying to get the fixes from #7 in TDBM.
I updated my composer.json like this:
Since there is no 1.0.5 version tagged yet, I thought it would fallback to dev-master, but it actually picked the 1.x branch (which is late).
This PR adds a "branch-alias" (https://getcomposer.org/doc/articles/aliases.md#branch-alias) to composer.json so that "master" branch becomes the dev branch of 1.0.x releases.
In parallel of merging this, I think you should completely delete the 1.X branch.