Skip to content

[DOC] add example to merge command #346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OCA-git-bot merged 1 commit into from
Apr 23, 2026
Merged

[DOC] add example to merge command #346

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ can be used to ask the bot to do the following:

* 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``)
Copy link
Copy Markdown
Collaborator

@legalsylvain legalsylvain Apr 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why 19.0 ?

Copy link
Copy Markdown

@OSevangelist OSevangelist Apr 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As an example only. What would you think?

Copy link
Copy Markdown

@ValentinVinagre ValentinVinagre Apr 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you explain the example? I don't quite understand it.

Copy link
Copy Markdown
Contributor Author

@madmooose madmooose Apr 23, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@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

* when the version was bumped, udate the changelog with ``oca-towncrier``
* run the main branch operations (see above) on it
* when the version was bumped, generate a wheel, rsync it to a PEP 503
Expand Down
Loading