1. Mailing Lists
  2. Contributors
  3. RE: Clarification on merge/squash the commits generated by bots or weblate

Contributors mailing list archives

contributors@odoo-community.org

Browse archives

Re: Clarification on merge/squash the commits generated by bots or weblate

Avatar

RE: Clarification on merge/squash the commits generated by bots or weblate

by
glueckkanja AG., Christopher Rogos
- 29/11/2024 09:24:25

When you migrate a module from 16 to 17, you create a new branch “17.0-mig-my_module” based on the 17.0 branch.

Then you transfer all commits from my_module to the new branch.

When you are working on branch “17.0-mig-my_module” you can use “git rebase -i origin/17.0” to rebase the transferred commits on your branch, and clean them up by squashing some.

 

 

From: Rolando Pérez Rebollo <notifications@odoo-community.org>
Sent: Freitag, 29. November 2024 00:13
To: Contributors <contributors@odoo-community.org>
Subject: Clarification on merge/squash the commits generated by bots or weblate

 

When reviewing this guide, it states:

"In order to squash these administrative commits, use git rebase -i origin/x, where x is the Odoo version (14.0, 15.0, 16.0,...). Don't forget first to do git fetch origin x to get the latest remote information."

In the context of migrating a module, this step is recommended after applying the patches and running pre-commit.

My question is: regarding the x branch mentioned above—does it refer to the source version or the target version for the migration?

Reference