Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add imported to .gitignore #440

Closed
wants to merge 1 commit into from
Closed

Conversation

carme-hp
Copy link
Contributor

@carme-hp carme-hp commented Aug 8, 2024

Hey, is there a reason why imported is not in .gitignore? It keeps messing with my PRs.

@carme-hp carme-hp requested a review from fsimonis August 8, 2024 14:40
@fsimonis
Copy link
Member

fsimonis commented Aug 9, 2024

We solved the underlying problem differently.

@fsimonis fsimonis closed this Aug 9, 2024
@fsimonis fsimonis deleted the add-imported-to-gitignore branch August 9, 2024 08:36
@MakisH
Copy link
Member

MakisH commented Aug 9, 2024

@fsimonis Can you please document the outcomes of the discussion here, and why you don't think it's a good idea to add the directory to the .gitignore?

@fsimonis
Copy link
Member

fsimonis commented Aug 9, 2024

The problem was that the submodules in imported don't update when changing branches. So there can be changes displayed even though the submodules haven't been touched.

The solution is to ignore the submodules and only git add the relevant changes.

If the submodule content is important for the changes, the use git pull --recurse-submodules to bring everything up to date.

@MakisH
Copy link
Member

MakisH commented Aug 9, 2024

The solution is to ignore the submodules

But the robust solution would be to add the complete imported/ directory in .gitignore, so that people don't accidentally commit such changes, no?

@fsimonis
Copy link
Member

fsimonis commented Aug 9, 2024

.gitignore ignores untracked files, not changes.

@MakisH
Copy link
Member

MakisH commented Aug 9, 2024

Ah, right, good point...
This would have been enough of a review.

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.

3 participants