[help] Merge instructions for new git history

[naikymen]

Hi all!

I've been busty the last few months and just now realized that the commit history has been re-written. Apparently to remove old references to PyHamilton, but I couldn't find an announcement.

The issue is that the commit history is now entirely independent of the one I have :( and I'm not sure how to bring my commits to the new history.

I imagine that the developers have already solved this. Would someone be willing to lend me a hand? I've tried some things unsuccessfully.

Thanks in advance!

[rickwierenga]

yes, i did do this and made a post here: https://discuss.pylabrobot.org/t/fixing-git-lfs-for-plr-required-rewriting-git-history/70/

it should be possible to rebase your changes onto the new main branch.

[naikymen]

I overestimate my searching skills. Sorry about that, and thanks. :)

[naikymen]

For the record I ended up making a diff file and applying it to the last common commit. I lost the commit history of my changes but its not a problem in my case.

[rickwierenga]

thank you for helping posterity!