Repository navigation

Keep the rebase conflict resolver's trust-read timeout over a later stop (#174) - #197

Merged

mchwang merged 10 commits into

mainfrom

fix/174-resolver-trust-timeout

Oct 21, 2026

Merged

Keep the rebase conflict resolver's trust-read timeout over a later stop (#174)#197
mchwang merged 10 commits into
mainfrom
fix/174-resolver-trust-timeout

Commits on Oct 21, 2026
- Keep the conflict resolver's trust-read timeout over a later stop (#174)
  
  mchwang
  and
  claude
  committed
  e224bda
- Address review round 1 of #197: deadline scope, gh fake shape, wording
  
  mchwang
  and
  claude
  committed
  e42d502
- Address review round 2 of #197: remaining gh fakes, deadline wording, test cost
  
  mchwang
  and
  claude
  committed
  6b782f8
- Address review round 3 of #197: test titles and stop wording
  
  mchwang
  and
  claude
  committed
  a75ab81
- Test retained ownership's precedence with a cause that is not a timeout (#197 review round 4)
  
  mchwang
  and
  claude
  committed
  864f184
- Say that the deadline case covers gh still stopping after the read's own timeout (#197 review round 5)
  
  mchwang
  and
  claude
  committed
  a60b468
- Save the action in the unsettled-conflict test, so the cited claim is tested (#197 review round 6)
  
  mchwang
  and
  claude
  committed
  1584cd2
- Quote the whole retained-resources message in the deadline case (#197 review round 7)
  
  mchwang
  and
  claude
  committed
  c709c65
- Name the conditions of the deadline message and the resolver test's case (#197 review round 8)
  
  mchwang
  and
  claude
  committed
  d99298a
- Name when the deadline test's deadline passes, and split the deadline sentence (#197 review round 9)
  
  mchwang
  and
  claude
  committed
  5105e98