Skip to content

Conversation

@celinval
Copy link

I believe this solves the subtree issue. For that I did the following:

  1. Moved library/contracts to contracts/.
  2. Created a library.patch with all changes we made to the library folder, by running:
# That is the commit where we added the library subtree. git diff 6efb19b38 -- library/ > library.patch
  1. Deleted the library/ folder
  2. Recreated the subtree from the branch subtree/library. I.e.:
git subtree add --prefix=library origin/subtree/library --squash
  1. Moved contracts back to library/contracts.
  2. Applied the patch and removed it.

Resolves #39

Call-out

DO NOT MERGE THIS PR. AFAIK, GitHub PR merge always rewrites the history, which I'm afraid may break the sub-tree.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.

@celinval celinval marked this pull request as ready for review July 17, 2024 02:29
@celinval
Copy link
Author

Closing this since I've pushed the changes to main. I don't know why GitHub did not close this automatically since the head of main is the same.

@celinval celinval closed this Jul 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

1 participant