Skip to content

chore: preserve canonical main lineage - #294

Closed
fasterthanlime wants to merge 3 commits into
mainfrom
chore/align-canonical-lineage-v2
Closed

fasterthanlime wants to merge 3 commits into
mainfrom
chore/align-canonical-lineage-v2

Conversation

@fasterthanlime

Copy link
Copy Markdown
Contributor

Empty tree diff. Merge the canonical checkout's preserved local ancestry with the current main squash commit. This PR must be merged with a merge commit, not squash, so both parent lineages become ancestors of main.

@fasterthanlime

Copy link
Copy Markdown
Contributor Author

Closing: repository policy forbids merge commits, and squashing cannot preserve ancestry. The lineage remains preserved on chore/align-canonical-lineage-v2.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants