From 5b9a20f18d5fd6430d39a1d325698d67d96254cf Mon Sep 17 00:00:00 2001 From: Marco Colombo Date: Fri, 30 Jul 2021 14:40:54 +0200 Subject: [PATCH] norebase #2285, merged #2336, #2355, conflicts #2327 --- supermerge.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/supermerge.sh b/supermerge.sh index 57df2099e012..f19f0f1eca48 100644 --- a/supermerge.sh +++ b/supermerge.sh @@ -33,21 +33,19 @@ fi set -xe rebase_n_merge https://github.com/odoo-italia/l10n-italy 14.0-premerge 14.0-premerge # fixes -#rebase_n_merge_pr 2285 +# rebase_n_merge_pr 2285 rebase_n_merge_pr 2303 rebase_n_merge_pr 2305 rebase_n_merge_pr 2309 rebase_n_merge_pr 2314 -rebase_n_merge_pr 2327 +rebase_n_merge_pr 2327 -X theirs rebase_n_merge_pr 2332 rebase_n_merge_pr 2335 -rebase_n_merge_pr 2336 rebase_n_merge_pr 2338 rebase_n_merge_pr 2344 rebase_n_merge_pr 2346 rebase_n_merge_pr 2352 rebase_n_merge_pr 2353 -rebase_n_merge_pr 2355 rebase_n_merge_pr 2358 rebase_n_merge_pr 2360 rebase_n_merge_pr 2364