committing pesky LICENSE.pdf, which git thinks I've changed#35
Closed
committing pesky LICENSE.pdf, which git thinks I've changed#35
Conversation
Contributor
|
See #32 |
Contributor
|
This seems to be fixed by fixing the gitattributes (in PR #32). Going to close this review for now, can reopen it if the problem returns. |
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.
Please approve this PR to see if it removes my issue with LICENSE.pdf every time I work in the rticonnextdds-connector-js repository. (I'm not sure if this PR will work because git harasses me about LICENSE.pdf even when I git clone an entirely clean connector repo.) Sam said I could try this.
Here's a description of the problem again:
I do this (while in develop or master, I can't remember which):
git checkout feature/CON-215-herculesReleaseNotesGit says this:
error: Your local changes to the following files would be overwritten by checkout: LICENSE.pdf Please commit your changes or stash them before you switch branches. AbortingI do this:
git stashGit does this:
Saved working directory and index state WIP on master: 7bb63c4 Update package.json for 1.0.0 Encountered 1 file(s) that should have been pointers, but weren't: LICENSE.pdfI do this:
git checkout feature/CON-215-herculesReleaseNotesGit does this:
error: Your local changes to the following files would be overwritten by checkout: LICENSE.pdf Please commit your changes or stash them before you switch branches. AbortingWash, rinse, repeat.