Skip to content
This repository was archived by the owner on Mar 13, 2024. It is now read-only.

loss of related histories #76

@gilesknap

Description

@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]$

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions