Skip to content

Conversation

@AlecThomson
Copy link
Contributor

Restores the full git history from the original RM-Tools repo. This was lost in the migration to the CIRADA-Tools repo since a copy was done rather than a fork/clone.

This history was restored using the following git commands:

git remote add original https://github.com/crpurcell/RM-tools.git
git merge original/master --allow-unrelated-histories --strategy=ours

The --strategy=ours resolved all conflicts by choosing commits from the CIRADA-Tools repo. Its possible that a more slick merge of the histories is possible, but that would require a lot fiddling.

@Cameron-Van-Eck Cameron-Van-Eck merged commit 94fba6d into CIRADA-Tools:master May 27, 2025
7 checks passed
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.

4 participants