Although this is not a Julia question, but a git question, I think it is likely that someone has already done something similar, given how Julia packages are git repos.
Anyways, we have two versions of the package ClimateBase, one in JuliaClimate and one on my account:
I initially started working on (2) as a draft, and I did not have the foresight that it would become a full rewrite of the existing ClimateBase.jl.
We now want to merge my version into the JuliaClimate version while keeping git history for both. The problem is, my version is not a fork… it is a brand new repo that doesn’t have any git connection with the original. I’ve tried some tutorials on google on how to do this, e.g. https://saintgimp.org/2013/01/22/merging-two-git-repositories-into-one-repository-without-losing-file-history/ but it didn’t work at all!
Is it possible? Anyone has any idea? I think what @SimonDanisch did for MakieLayout in this PR: https://github.com/JuliaPlots/AbstractPlotting.jl/pull/449 is pretty much what I want to achieve as well…