Skip to content

committing pesky LICENSE.pdf, which git thinks I've changed#35

Closed
rkorte wants to merge 1 commit intomasterfrom
feature/CON-194-license
Closed

committing pesky LICENSE.pdf, which git thinks I've changed#35
rkorte wants to merge 1 commit intomasterfrom
feature/CON-194-license

Conversation

@rkorte
Copy link
Copy Markdown
Contributor

@rkorte rkorte commented Dec 22, 2020

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-herculesReleaseNotes
Git 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. Aborting

I do this:
git stash
Git 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.pdf

I do this:
git checkout feature/CON-215-herculesReleaseNotes
Git 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. Aborting

Wash, rinse, repeat.

@samuelraeburn
Copy link
Copy Markdown
Contributor

See #32

@samuelraeburn
Copy link
Copy Markdown
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.

@alejnp alejnp deleted the feature/CON-194-license branch February 16, 2026 11:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants