NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-19 17:35:45 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
17.0-api-xdo
runbot/forwardport/changelog/2022-06/conflict-diff3.md

2 lines
98 B
Markdown
Raw Permalink Normal View History

[FIX] forwardport: use diff3 for conflict style Existing conflict style is the local default ("merge", most likely). `diff3` is a lot more informative as it provides the common ancestor's code for the hunk, which helps see how the two branches diverged and thus resolve the conflict. Even better would be zdiff3 but that's a bit too recent... Fixes #619
2022-06-24 20:57:45 +07:00
IMP: use the `diff3` conflict style, should make forward port conflicts clearer and easier to fix
Reference in New Issue Copy Permalink