Root commit vs origin commit.

[gilesknap]

For the project https://github.com/gilesknap/mciwb, I'm trying to pull main from skeleton like so

git pull git@github.com:DiamondLightSource/python3-pip-skeleton.git main

This causes unexpected results. It seems to be replaying all of mciwb commits as a rebase over the last skeleton commit.

Resolving the initial rebase merge conflict with mciwb's initial commit results in:

If you look in the history of skeleton main I squashed it down to a single commit after the initial commit and made that single commit the origin for skeleton adoption.

The new origin commit is de6d5f1
The old origin commit (which is also the initial commit) is ededf00

It seems that having the origin commit not be the same as initial commit is causing this.

[gilesknap]

I have:

• updated skeleton-cli and restored SKELETON_ROOT_COMMIT to the actual root commit.
• re-adopted skeleton into mciwb
• done a pull from the pydata-docs branch of skeleton

This behaves as expected.

[gilesknap]

@GDYendell @coretl

Can we discuss the implications of a re-adoption with the same root commit?

Gary added a check to see if the root commit was in the history and I had to add a flag to override that since we are now encouraging re-adoption. My changing of the root commit was an attempt to find a different solution but that has failed.

If there is a reason that re-adopt is an issue we can work out a way of changing the commit ID of the initial commit.

[gilesknap]

I believe this is not an issue. Where I had problems in #56 it turned out to be git settings defaulting to rebase.

Closing this as a non-issue unless anyone has any further info?