Problem

Tonel Git conflicts force agents and humans into raw text conflict markers even when the real conflict is at package/class/method level.

Proposal

Add repository tooling for image-side merge workflows:

• merge a branch or commit into an Iceberg repository when supported;
• optionally cherry-pick a commit if Iceberg can support it, otherwise report it as unsupported;
• return structured conflicts by package, class, side, selector, and source variants;
• provide follow-up actions such as keep ours, keep theirs, edit merged method, abort, and continue.

Reproduction

Cherry-pick a branch that edits a class-side method moved or replaced on main. Git reports a Tonel text conflict, but the useful unit of work is a Pharo method conflict.

Fix idea

Build on Iceberg/Monticello merge conflict objects where possible. If cherry-pick must be implemented outside Iceberg, start with a conservative merge/status/conflict contract before adding commit replay.