Repository navigation

feat(service): merge-request Layer 2 - lifecycle, derived status, conflict resolution (DMD-1899) - #703

Merged

martinsifra merged 18 commits into

mainfrom

ms/dmd-1899/cli-layer-2

Sep 3, 2026

Merged

feat(service): merge-request Layer 2 - lifecycle, derived status, conflict resolution (DMD-1899)#703
martinsifra merged 18 commits into
mainfrom
ms/dmd-1899/cli-layer-2

Commits on Sep 2, 2026
- refactor(json): expose compute_diff's walk as structured DiffEntry data
  
  martinsifra
  and
  claude
  committed
  9980855
- feat(errors): MR merge-409 codes + surface the API's string code in details [DMD-1899]
  
  martinsifra
  and
  claude
  committed
  2df791b
- feat(service): MR status-derivation polyfill + admin identity on verify [DMD-1899]
  
  martinsifra
  and
  claude
  committed
  0349204
- feat(service): MergeRequestService reads -- list, find-by-branch, detail [DMD-1899]
  
  martinsifra
  and
  claude
  committed
  c66cca9
- feat(service): MR create, update and review transitions [DMD-1899]
  
  martinsifra
  and
  claude
  committed
  760e533
- feat(service): merge -- 409 mapping + post-merge local cleanup [DMD-1899]
  
  martinsifra
  and
  claude
  committed
  19b3d87
- feat(service): conflicts, per-path 3-way diff, resolve via rebase [DMD-1899]
  
  martinsifra
  and
  claude
  committed
  07e3097
- fix(service): apply the PR #703 self-review findings [DMD-1899]
  
  martinsifra
  and
  claude
  committed
  1c9c9e6
- fix(service): apply the Opus wire-truth review -- 409 codes, allowed_actions, derive_state honesty [DMD-1899]
  
  martinsifra
  and
  claude
  committed
  629625a
- style(service): hoist side_value out of the loop, typed test sentinel [DMD-1899]
  
  martinsifra
  and
  claude
  committed
  f6bc60b
- fix(service): one predicate for the server viewer block (Copilot review) [DMD-1899]
  
  martinsifra
  and
  claude
  committed
  a51a6f2
- feat(service): tell a SOX refusal apart from a missing feature [DMD-1899]
  
  martinsifra
  and
  claude
  committed
  0257675
- fix(service): apply the Layer 1 RFC findings [DMD-1899]
  
  martinsifra
  and
  claude
  committed
  13ff700
- fix(service,http): apply Zajca's PR review -- null-value guards, feature-aware find, bounded params [DMD-1899]
  
  martinsifra
  and
  claude
  committed
  22274dc
- fix(http): restore details= on the 401 INVALID_TOKEN raise lost in the rebase [DMD-1899]
  
  martinsifra
  and
  claude
  committed
  565e239
- fix(service): apply Zajca's second review -- full replace-body guard, null-side classification, delete warning [DMD-1899]
  
  martinsifra
  and
  claude
  committed
  175d45b
- docs(code): repoint RFC references to the ms/merge-requests-rfcs branch [DMD-1899]
  
  martinsifra
  and
  claude
  committed
  4dbfc00
Commits on Sep 3, 2026
- fix(service): apply Zajca's third review -- record degradations, honest outcomes, wire-equivalent take [DMD-1899]
  
  martinsifra
  and
  claude
  committed
  7cd1855

Commits

Commits on Sep 2, 2026

Commits on Sep 3, 2026