Submodule merge - #24
Open
sogehige wants to merge 7434 commits into
Open
Conversation
Loading
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Fetch the submodule commits into the main repository
git remote add backend https://github.com/sogebot/sogeBot.git
git fetch backend
Start a fake merge (won't change any files, won't commit anything)
git merge -s ours --no-commit backend/master
Do the same as in the first solution
git rm --cached backend # delete reference to submodule HEAD
git rm .gitmodules # if you have more than one submodules,
# you need to edit this file instead of deleting!
rm -rf backend/.git # make sure you have backup!!
git add backend # will add files instead of commit reference
Commit and cleanup
git commit -m "removed submodule"
git remote rm backend