Re: [PATCH b4 v3 0/9] shazam: stop --resolve from silently dropping commits

On Thu, 25 Jun 2026 14:09:20 +0200, Christian Brauner wrote:
> shazam: stop --resolve from silently dropping commits
> 
> b4 shazam --resolve exists to help land a series that doesn't apply
> cleanly. The problem that motivated this series is that, while resolving,
> it can silently drop whole commits from the merge it produces: you end up
> with a merge that is quietly missing changes, and nothing in the output
> points at what went missing.
> 
> [...]

Applied, thanks!

[1/9] review-tui: lift worktree am-conflict helpers into b4 core
      commit: 6b15cfa16456da10b8af880545435b66e5d9495f
[2/9] shazam: resolve conflicts via native git-am, never dropping patches
      commit: 7190ccb7f1a3c8fbc3e012d166f132af63c11f74
[3/9] shazam: test native-am conflict resolution keeps every patch
      commit: bb612997ec37248ea5522f76620fbdc01587f44b
[4/9] shazam: resolve conflicts in subdirectory files, not just the repo root
      commit: 5c23710165d4c2795060e89269334822f2bb0c75
[5/9] shazam: note subshell alternative to the --resolve two-phase model
      commit: eb4912334a3a0df55e8d1565f8e21a81770a7ba3
[6/9] shazam: resolve --resolve conflicts inline via a subshell
      commit: 51ddf6927cee81f0a5ea948658c0f50c617b38e2
[7/9] shazam: test the inline --resolve subshell flow
      commit: 13bf2b686de5fa54637ef3651fde7684d3386677
[8/9] review-tui: don't leave a take's target worktree mid-conflict
      commit: 84ad10c6c8b903c9b337e7ef15c32eab96788f15
[9/9] review-tui: test take-worktree conflict abort and dirty-target guard
      commit: 4ce46544a9c9dd12d56ce559da2f746e006c4e2d

Best regards,
-- 
Konstantin Ryabitsev <[email protected]>