Re: Repairing the elpa branch

[Glenn Morris]

Stefan Monnier wrote:

> I think capturing those merges is important.

I'll try it then.

> And the r170 merge is not special, IIUC. 

Oh, I thought it was because it came from bzr-git, or bzr join, or
something?

> It was just the first such merges, so if you replace it with a flat
> commit, the next merge will turn into the source of the problem.

Then it seems pointless for me to try and copy the merges?

But r10, 28, 33, 76 were also merges...