Eliot et List,

I don't use that VCS feature because I use a different branch model.

Do FileIn handwaving to cherrypick it locally onto the common trunk closest
to the branches, then merge that 1-commit branch into both yours and theirs
to make it a common ancestor. It may be a bit of a pain from a duplicate
change on yours, but if Monticello is at all good it should merge cleanly
if it's a true duplication.

On Fri, Jan 6, 2023, 17:36 Eliot Miranda <eliot.miranda at gmail.com> wrote:

> Hi All, Hi Vanessa,
>
>     does Monticello support the equivalent of git cherry-pick,
> specifically to merge a set of commits from one branch of a package into
> another?  If not, how would I implement it?  Tom Braun and I are working on
> two different branches of VMMaker, his adding incremental old space garage
> collection and compaction, mine regular trunk maintennance.  I want to
> integrate two recent commits of mine fixing a become bug into Tom's
> branch.  Or course I could just file out the changes, but in bringing them
> in there would be no common-ancestor check to show me conflicts.
>
> I'm happy to use a script-based approach, and would happily pair with
> someone to attempt to implement a UI, perhaps based on a repository
> inspector or history view there-from.
> _,,,^..^,,,_
> best, Eliot
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.squeakfoundation.org/pipermail/squeak-dev/attachments/20230106/68d1958f/attachment.html>