Re: MPS experiment successful

[Eli Zaretskii]

> From: Gerd Möllmann <gerd.moellmann@gmail.com>
> Cc: emacs-devel@gnu.org
> Date: Wed, 17 Apr 2024 20:41:12 +0200
> 
> Eli Zaretskii <eliz@gnu.org> writes:
> 
> > The packages code will need to be moved aside, yes.  But for the rest,
> > why shouldn't a simple merge do the job?  They seem to be orthogonal,
> > by and large.
> 
> Coming to think of it again - how would I tell git merge the difference
> between the package related changes and GC related changes?

Assuming you know at what commit you started working on MPS, make the
diffs relative to that commit.  If you didn't in parallel work on
packages as well, there should be no problem.  If you did make changes
to packages while working on MPS, tough.

(I'm actually surprised you didn't start a local branch for the MPS
stuff.  If you did, just make the diffs from that branch.)