Skip to Content
  2. Mailing Lists
  3. Contributors
  4. Clarification on merge/squash the commits generated by bots or weblate

Archives

Contributors

Vertical support

EDI broker integrations

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?

by Ing. Rolando Pérez Rebollo - 12:11 - 29 Nov 2024

Follow-Ups

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

    Thank U, Christopher.

    \Rebollo

    On 11/29/24 03:28, Christopher Rogos wrote:

    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?

    _______________________________________________
    Mailing-List: https://odoo-community.org/groups/contributors-15
    Post to: mailto:contributors@odoo-community.org
    Unsubscribe: https://odoo-community.org/groups?unsubscribe

    by Ing. Rolando Pérez Rebollo - 10:26 - 29 Nov 2024
  • RE: Clarification on merge/squash the commits generated by bots or weblate

    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?

    by Christopher Rogos - 09:26 - 29 Nov 2024