Contributors mailing list archives
contributors@odoo-community.org
Browse archives
Re: No upstream merges in OCB in April
by
        
            Acsone SA/NV, Stéphane Bidoul
        
        
        
    
        
        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
Reference
- 
                No upstream merges in OCB in AprilbyQuartile Corporation, Yoshi Tashiro.- 10/04/2025 15:20:35 - 0- 
                
- 
                Re: No upstream merges in OCB in AprilbyTecnativa. S. L., Pedro M. Baeza- 04/08/2025 17:35:06 - 0
- 
                
- 
                Re: No upstream merges in OCB in AprilbyQuartile Corporation, Yoshi Tashiro.- 11/04/2025 10:47:17 - 0
- 
                Re: No upstream merges in OCB in AprilbyTecnativa. S. L., Pedro M. Baeza- 11/04/2025 09:03:04 - 0
 
-