Re: [PATCH b4 v2 0/6] review-tui: worktree-aware takes, resolve take->merge conflicts in place

On Tue, 23 Jun 2026 22:34:16 +0200, Christian Brauner wrote:
> review-tui: worktree-aware takes, resolve take->merge conflicts in place
> 
> b4 review's "take" action applies a reviewed series to a target branch by
> one of two methods: a merge (git merge) or a linear/cherry-pick apply (git
> am). Review is often driven from a different worktree than the one the
> series is applied into, and the target branch may be checked out in yet
> another worktree, so a take has to run wherever the target branch lives and
> never disturb the current checkout. This series makes both take methods do
> that correctly and teaches take->merge to resolve conflicts in place.
> 
> [...]

Applied, thanks!

[1/6] review-tui: factor cross-worktree take setup into _take_worktree
      commit: 4951ef12e9d1840a1ca6c54349ff5c04dd3bab55
[2/6] review-tui: run take->am in the target branch's worktree
      commit: 359461dab31d67b2f622ac219d7dec52b5488a9a
[3/6] review-tui: test cross-worktree takes
      commit: 782fd0e009fc633d5d25ddf451d68d8c5900d470
[4/6] review-tui: run take->merge abort in the target branch's worktree
      commit: f7e6f2ac6094bf7c47aece39d9a077ce39623f7a
[5/6] review-tui: resolve take->merge conflicts in place
      commit: 089665dbb6ba02f02683cc2256a38314e843a12c
[6/6] review-tui: test take->merge conflict resolution
      commit: 31de72604837bcec7c79ca3b541458923b527803

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