> On Aug 15, 2023, at 12:15 PM, Jessica Clarke <[email protected]> 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
signature.asc
Description: Message signed with OpenPGP
