For future reference, the approach was to run git checkout <current master SHA> <file> for all the non-essential files (test/, perf/, README, etc...). I then squashed all the commits so git didn't have to deal with rebase conflicts in the non-essentials. Since everything in Meshes2/src was named differently, git rebase just worked without a fuss.
Coverage remained the same at 0.0% when pulling 0b0dfff3ad7a0cd2c7bcb28255070fe11b4099de on sjk/meshes2-merge into 3340efdd0ce1f64914130f9d2b43a0ae8588c0c1 on master.
I just wanted to see if this was possible to rebase @SimonDanisch work in https://github.com/JuliaGeometry/Meshes2.jl here since it is a seperate repo. Apparently it is.
For future reference, the approach was to run
git checkout <current master SHA> <file>
for all the non-essential files (test/, perf/, README, etc...). I then squashed all the commits so git didn't have to deal with rebase conflicts in the non-essentials. Since everything in Meshes2/src was named differently, git rebase just worked without a fuss.