Bring F3 up to K2 on its release branch (part 1 of 3)
mesh/merge-gate head 0cd95c69f0f4 merged into trunk fcdecb436117 — fail: head 0cd95c69f0f4 does not merge cleanly into trunk fcdecb436117: in conflict inte…
mesh/repo-check head 0cd95c69f0f4 merged into trunk fcdecb436117 — fail: head 0cd95c69f0f4 does not merge cleanly into trunk fcdecb436117: in conflict inte…
mesh/delivery superseded: a newer head of the same pull request
mesh/merge-gate head 0cd95c69f0f4 merged into trunk fcdecb436117 — fail: head 0cd95c69f0f4 does not merge cleanly into trunk fcdecb436117: in conflict inte…
mesh/repo-check head 0cd95c69f0f4 merged into trunk fcdecb436117 — fail: head 0cd95c69f0f4 does not merge cleanly into trunk fcdecb436117: in conflict inte…
mesh/delivery superseded: a newer head of the same pull request
The release branch's head isfcdecb43, with K2 (#323);920ba34bwas brought up to an older head. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -83,6 +83,8 @@ func (r *recorded) run(_ context.Context, dir, name string, args ...string) (str
|
||||
return r.tree + "\n", nil
|
||||
case name == "git" && len(args) > 0 && args[0] == "rev-parse":
|
||||
return "c0ffeec0ffeec0ffeec0ffeec0ffeec0ffeec0ff\n", nil
|
||||
case name == "git" && len(args) > 1 && args[0] == "rev-list" && args[1] == "--count":
|
||||
return "42\n", nil
|
||||
}
|
||||
return "", nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user