Skip to content
Snippets Groups Projects
Commit 80f22f98 authored by Christophe Monniez's avatar Christophe Monniez
Browse files

[IMP] test_lint: add a test to detect git conflict markers


Since the deployement of the forward-port bot, chances to merge code
with conflict markers has greatly increased.

With this commit, a new test is added to grep for those markers in most
common code files.

closes odoo/odoo#39813

Signed-off-by: default avatarChristophe Monniez (moc) <moc@odoo.com>
parent 75b1d412
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment