[DOC] add example to merge command#346
Merged
OCA-git-bot merged 1 commit intoOCA:masterfrom Apr 23, 2026
Merged
Conversation
madmooose
force-pushed
the
explain_merge_attributes
branch
from
c93b144 to
3ce2906
Compare
| * merge the PR onto a temporary branch created off the target branch | ||
| * merge when tests on the rebased branch are green | ||
| * optionally bump the version number of the addons modified by the PR | ||
| * optionally bump the version number of the addons modified by the PR. (e.g. 19.0. ``major`` . ``minor`` . ``patch``) |
There was a problem hiding this comment.
As an example only. What would you think?
There was a problem hiding this comment.
Could you explain the example? I don't quite understand it.
Contributor
Author
There was a problem hiding this comment.
@ValentinVinagre
Long version of the example for 19.1.0.0
- major: 19.0.2.0.0
- minor: 19.0.1.1.0
- patch: 19.0.1.0.1
- nobump: 19.0.1.0.0
I'm open for a more understandable version to make this clear to everybody
|
lgtm |
|
/ocabot merge nobump |
Contributor
|
This PR looks fantastic, let's merge it! |
Contributor
|
Congratulations, your PR was merged at eb48c96. Thanks a lot for contributing to OCA. ❤️ |
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
5 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.
No description provided.