Archives

Contributors

Re: No upstream merges in OCB in April

Re: No upstream merges in OCB in April

Yes, the conflict on 17.0 was the cause.

Best regards,

-Stéphane

On Mon, Aug 4, 2025 at 5:37 PM Pedro M. Baeza <notifications@odoo-community.org> wrote:

I have manually synchronized 16.0 and 17.0 branches.

There was a conflict in the 17.0 branch, and this may abort the rest of the sync I suppose.

Regards.

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

by Stéphane Bidoul - 06:21 - 4 Aug 2025

Reference

No upstream merges in OCB in April

It looks like OCB hasn't merged remote-tracking branches for a while (no merges so far in April). Is something clogging the process? Some of our OCA PRs are affected by this, since the fix in Odoo hasn't yet reached OCB.

--
Yoshi Tashiro
Quartile

by Yoshi Tashiro. - 03:21 - 10 Apr 2025