Patch: Propose to rebase on failing to patch

camptocamp · Jun 11, 2024 · 102e556 · 102e556
1 parent 6c69eb7
commit 102e556
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/github_app_geo_project/module/standard/patch.py b/github_app_geo_project/module/standard/patch.py
@@ -146,7 +146,12 @@ async def process(
                             if proc.returncode != 0:
                                 message.title = f"Failed to apply the diff {artifact.name}"
                                 _LOGGER.warning(message)
-                                raise PatchException("Failed to apply the diff")
+                                return module.ProcessOutput(
+                                    success=False,
+                                    output={
+                                        "summary": "Failed to apply the diff, you should probably rebase your branch"
+                                    },
+                                )
                             message.title = f"Applied the diff {artifact.name}"
                             _LOGGER.info(message)