Ignore "dirty" nupic.core submodule #794
Closed
Conversation
This file contains 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
This reverts commit 23ba9fa.
Rebase fork
Rebase fork
`ignore = dirty` option avoids that git include the word -dirty in the end of the submodule SHA when files in a submodule folder are changed.. If these changes aren't reverted, it's impossible synchronize nupic repo with a "dirty" submodule.. As we should pull PRs directly from `nupic.core` repo cloned to our machine, not from its `/nta` subfolder in `nupic`, I think is simpler ignore the changes were in `/nta` and so avoid typing commands to ignore manually these changes.. I saw several developers that recommend this option: http://stackoverflow.com/questions/3240881/git-can-i-suppress-listing-of-modified-content-dirty-submodule-entries-in-sta http://www.nils-haldenwang.de/frameworks-and-tools/git/how-to-ignore-changes-in-git-submodules bronson/vim-update-bundles#32
|
Before merging, I started a ML discussion about this. |
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.
ignore = dirtyoption avoids that git includes the word -dirty in the end of the submodule SHA when files in a submodule folder are changed.. If these changes aren't reverted, it's impossible synchronize nupic repo with a "dirty" submodule..As we should pull PRs directly from
nupic.corerepo cloned to our machine, not from its/ntasubfolder innupic, I think is simpler ignore the changes were in/ntaand so avoid typing commands to ignore manually these changes..I saw several developers that recommend this option:
http://stackoverflow.com/questions/3240881/git-can-i-suppress-listing-of-modified-content-dirty-submodule-entries-in-sta
http://www.nils-haldenwang.de/frameworks-and-tools/git/how-to-ignore-changes-in-git-submodules
bronson/vim-update-bundles#32