Archives
Contributors
Re: No upstream merges in OCB in April
Hi, Yoshi,
There was a change upstream in README.md that conflicts with OCB, as detected by Denis in https://github.com/OCA/OCB/pull/1293#issuecomment-2796016633. I have pulled locally and fix the conflict, pushing the result, and it should return to normal synchronization.
Thanks for noticing.
by Pedro M. Baeza - 09:06 - 11 Apr 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 TashiroQuartile
by Yoshi Tashiro. - 03:21 - 10 Apr 2025-
Re: No upstream merges in OCB in April
Yes, the conflict on 17.0 was the cause.Best regards,-StéphaneOn 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 -
Re: No upstream merges in OCB in April
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.
by Pedro M. Baeza - 05:36 - 4 Aug 2025 -
Re: No upstream merges in OCB in April
Le 10/04/2025 à 15:23, Yoshi Tashiro a écrit : > 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. Repeat problem? It's currently about two weeks behind.. last commit in OCB is 21/07/25. -- Richard PALO
by RP - 04:55 - 4 Aug 2025 -
Re: No upstream merges in OCB in April
Awesome. Thank you very much, Pedro and Denis!--Yoshi TashiroQuartileOn Fri, Apr 11, 2025 at 4:07 PM Pedro M. Baeza <notifications@odoo-community.org> wrote:Hi, Yoshi,There was a change upstream in README.md that conflicts with OCB, as detected by Denis in https://github.com/OCA/OCB/pull/1293#issuecomment-2796016633. I have pulled locally and fix the conflict, pushing the result, and it should return to normal synchronization.Thanks for noticing.
_______________________________________________
Mailing-List: https://odoo-community.org/groups/contributors-15
Post to: mailto:contributors@odoo-community.org
Unsubscribe: https://odoo-community.org/groups?unsubscribe
by Yoshi Tashiro. - 10:51 - 11 Apr 2025 -
Re: No upstream merges in OCB in April
Hi, Yoshi,There was a change upstream in README.md that conflicts with OCB, as detected by Denis in https://github.com/OCA/OCB/pull/1293#issuecomment-2796016633. I have pulled locally and fix the conflict, pushing the result, and it should return to normal synchronization.Thanks for noticing.
by Pedro M. Baeza - 09:06 - 11 Apr 2025
-