Merge commits from master that are missing in 3.x-dev #12859
Closed
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
Release Piwik 3.2.1
Matomo 3.3.0-b2
Matomo 3.4.0
Found `piwik`
Matomo 3.5.0
|
As you can see in the PR there are no files changed, as all changes from those commits have already been done on 3.x-dev. Guess it doesn't matter if we merge or not... |
|
There are no changes so I wouldn't merge this, creates only confusion. |
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.
Seems some commits are in master, but not in 3.x-dev, which is not expected (likely those PRs that were created in the wrong branch). Should we merge it in 3.x-dev then?
Is there maybe any security risk in merging this PR?