Merge master to dev to resolve conflicts #109
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
Contributor
Hlavtox
commented
Sep 14, 2024
Hlavtox
commented
| Questions | Answers |
|---|---|
| Description? | Release 3.2.0 has some conflicts, this is a branch merging changes from master into dev, should resolve it. |
| Type? | |
| BC breaks? | |
| Deprecations? | |
| Fixed ticket? | |
| Sponsor company | |
| How to test? |
Release 3.1.0
Release 3.1.1
Release version 3.1.2
Release 3.1.3
* Remove useless Google Analytics parameters * Delete PULL_REQUEST_TEMPLATE.md * Update build-release.yml * Update README.md * Update README.md * feat: remove mobile desactivation * Release 3.1.4 --------- Co-authored-by: JoseNOM <[email protected]> Co-authored-by: Mathieu Ferment <[email protected]> Co-authored-by: leemyongpakvn <[email protected]> Co-authored-by: Krystian Podemski <[email protected]> Co-authored-by: florine2623 <[email protected]> Co-authored-by: Daniel Hlavacek <[email protected]> Co-authored-by: Guyomar Alexis <[email protected]>
ShaiMagal
approved these changes
Sep 14, 2024
matks
changed the title
|
I see you used my suggestion for the name of the branch 😄 congrats on your first branch merge This is what we do every week in PRs like PrestaShop/PrestaShop#36551 |
Because GitHub considers that a PR is merged when the commits of its source branch have been added to the target branch. A Pull Request is simply a request to transfer commits from one branch to another, with some metadata (labels, messages, body...). It has no specific status, it's the commits status which is acknowledged. |
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.