← Take from branch
In a Chevron diff, each changed block in your working file gets a ← Take from <branch> action. Click it and the block is replaced with the branch’s version: additions removed, deletions restored, modifications reverted.
It’s a single edit, so one Ctrl/⌘ Z undoes it. If the file changed underneath it, Chevron refuses to apply rather than guessing.