Re: git: 28f6c2f29280 - main - Import GoogleTest 1.14.0

From: Enji Cooper <yaneurabeya_at_gmail.com>
Date: Tue, 15 Aug 2023 23:43:13 UTC 
> On Aug 15, 2023, at 12:15 PM, Jessica Clarke <jrtc27@FreeBSD.org> wrote:

…

> What’s this thing? Sounds like you did some merging, squashing and
> rebasing, didn’t fix up the commit message and didn’t notice that git
> rebase eats merges? See [1] for how to do this properly.

	Ugh. That process looks incredibly annoying—especially when dealing with conflicts that can’t be easily scripted due to changes made in the pre-git vendor-forked source tree. Ok, I'll do next time.
Thank you for the pointer,
-Enji