rebase: ignore untracked files in submodules#4151
Merged
ethomson merged 1 commit intolibgit2:masterlibgit2/libgit2:masterfrom Mar 9, 2017
novalis:dturner/rebase-submodule-untrackednovalis/libgit2:dturner/rebase-submodule-untrackedCopy head branch name to clipboard
Merged
rebase: ignore untracked files in submodules#4151ethomson merged 1 commit intolibgit2:masterlibgit2/libgit2:masterfrom novalis:dturner/rebase-submodule-untrackednovalis/libgit2:dturner/rebase-submodule-untrackedCopy head branch name to clipboard
ethomson merged 1 commit intolibgit2:masterlibgit2/libgit2:masterfrom
novalis:dturner/rebase-submodule-untrackednovalis/libgit2:dturner/rebase-submodule-untrackedCopy head branch name to clipboard
Conversation
An untracked file in a submodule should not prevent a rebase from starting. Even if the submodule's SHA is changed, and that file would conflict with a new tracked file, it's still OK to start the rebase and discover the conflict later. Signed-off-by: David Turner <dturner@twosigma.com>
Contributor
Author
|
Ping? |
Member
|
Sorry for the delay - this looks good to me. Thanks! |
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
2 participants
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.
An untracked file in a submodule should not prevent a rebase from
starting. Even if the submodule's SHA is changed, and that file would
conflict with a new tracked file, it's still OK to start the rebase
and discover the conflict later.
Signed-off-by: David Turner dturner@twosigma.com