Skip to content

Report git's stderr when a merge fails without leaving conflicts #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danielhanchen merged 1 commit into from
Aug 4, 2026
Merged

Report git's stderr when a merge fails without leaving conflicts #63

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions scripts/unsloth/repin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,18 @@ def repin_one(pin: dict, base: str, work: Path) -> dict:
res = json.loads(report.read_text()) if report.exists() else {}
if rc != 0:
out["action"] = "conflict"
out["files"] = [x["file"] for x in res.get("refused", [])]
out["note"] = "; ".join(
f"`{x['file']}`: {x['reason']}" for x in res.get("refused", [])
) or "merge conflicted"
refused = res.get("refused", [])
out["files"] = [x["file"] for x in refused if x["file"] != "-"]
if out["files"]:
out["note"] = "; ".join(f"`{x['file']}`: {x['reason']}" for x in refused)
else:
# git refused the merge without leaving a single conflicted
# file, so the conflict report explains nothing. Its stderr is
# the only thing that does, and discarding it turns a
# diagnosable failure into "no conflicted files".
tail = ((m.stderr or "") + (m.stdout or "")).strip().splitlines()
out["note"] = ("merge failed with no conflicts: " + " / ".join(tail[-3:])
if tail else "merge failed and git said nothing")
run(["git", "merge", "--abort"], cwd=repo, check=False)
return out
out["hunks"] = [
Expand Down