Repository navigation
Merge submodules - #148
Open
DaltonSW wants to merge 6 commits into
Open
Merge submodules#148DaltonSW wants to merge 6 commits into
DaltonSW wants to merge 6 commits into
Conversation
DaltonSW
marked this pull request as ready for review
October 12, 2026 18:57
Collaborator
|
I think the commits should be squashed, given that BrawlHeaders is not going away under our broader plan. All this history will be preserved in the original repo; we will just stop accepting direct edits to it and ask people to (re-)open their PRs here now. I'd like to avoid duping a ton of history and burying commits we've made here so far. |
DaltonSW
force-pushed
the
merge_submodules
branch
from
October 13, 2026 14:32
6d09b58 to
ec07d20
Compare
Contributor
Author
|
Updated to squash. I did some research and it seems like with subtrees, this should let us still push new commits onto the base repo without requiring force-pushing the squash as well, which I was initially concerned about. I didn't want to rewrite the history of the submodules |
This was referenced Oct 17, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Commands run to produce this:
I ran these without
--squashso the commit history and attribution would stay accurate.Commits to those directories can now be made as part of this repo without the need for getting stuff merged into submodules first. To sync them back to the root repos, anybody with push access to the original repos can run:
I'm admittedly unsure of what will happen if OpenRVL is cloned and someone tries pushing to BrawlHeaders. That directory still contains a
.gitmodulesfile, so git might just choose to ignore everything inside of it since it's marked a submodule