bugfix: only abort merge when is needed

2026-09-28 14:35:10 -03:00
parent 98f71d5481
commit 61712b0872
2 changed files with 8 additions and 1 deletions
@@ -63,6 +63,11 @@ class Git:
    def get_branches(prefix: str = ""):
        return Git._get_references("heads/" + prefix)

+    @staticmethod
+    def is_merging() -> bool:
+        """Indica si hay un merge en curso (existe MERGE_HEAD), con o sin conflictos."""
+        return Git("rev-parse", "MERGE_HEAD", quiet=True, verify=True).code() == 0
+
    @staticmethod
    def status():
        return list(map(Git.Status, Git("status", porcelain=True).lines(False)))