loss of related histories

[gilesknap]

There is a recurring issue where related histories are somehow lost after a skeleton-cli "exisiting" merge.

This makes it very hard to adopt changes from the skeleton project.

e.g. [email protected]:gilesknap/gphotos-sync.git

(venv) (skeleton) [giles@ws1 gphotos-sync]$ git pull https://github.com/DiamondLightSource/python3-pip-skeleton main
From https://github.com/DiamondLightSource/python3-pip-skeleton
 * branch            main       -> FETCH_HEAD
fatal: refusing to merge unrelated histories
(venv) (skeleton) [giles@ws1 gphotos-sync]$