v1.10.2 - suggest merge to master

[meonkeys]

Hi @allinurl,

Git expert here. 637824b is an orphan commit/branch, tagged v1.10.2. I suggest merging this commit/branch into master so the v1.10.2 tag is part of the ancestry of master.

Test with git describe at the tip of master. Before the merge that'll say something like v1.10.1-25-g2bd25460. Afterwards it should look something like v1.10.2-2-hhhhhhhhh.

Ah, looks like you strive for a linear commit history... in that case you may prefer to rebase and force-push, but then the most recent commit sha-1 checksums will change.

I hope this is helpful. Best,
-Adam

[allinurl]

Thanks for sharing that. I'm not sure what caused it, but it should be fixed now. I rebased, so the most recent 5 or 6 commit hashes have changed. Let me know how it looks on your end.

[allinurl]

bummer. I think a few of the latest PRs are going to run into conflicts now

[meonkeys]

v1.10.2 LGTM.

Whatever you do don't move the v1.9.3 tag! heh 😅