pkg-merge: Always submit a new MR, even with conflicts

Create a MR even when the local attempt to merge failed. In that case let the proposed updates branch point to the upstream branch and create a MR to submit it to the downstream branch.

This makes the failed updates more visbile and easier to track than the failed pipelines.

Task: T7797

package-source-builder/overlay/usr/bin/apertis-pkg-merge-upstream-to-downstreams

@@ -18,9 +18,7 @@ def parse_ref(ref: str) -> str:
     return git('rev-parse', '-q', '--verify', ref + '^{commit}', _ok_code=[0, 1]).strip('\n')
 
 def ensure_branch(name: str, fallbacks: list) -> str:
-    if parse_ref(f'origin/{name}'):
-        return name
-    for b in fallbacks:
+    for b in [name, *fallbacks]:
         commit = parse_ref(f'origin/{b}')
         if commit:
             print(f'Setting branch {name} to point to {b} ({commit:.7})')
@@ -44,7 +42,7 @@ def existing_upstream_branches(upstream: str):
 
 def get_matching_downstream_branch(downstream: str, upstream: str):
     if re.search(r'(dev[0-9]|pre)$', downstream):
-        return downstream
+        return ensure_branch(downstream, [])
     else:
         if upstream.endswith('-security'):
             return ensure_branch(f'{downstream}-security', [f'{downstream}-updates', downstream])