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

Remove .pot file again #646

Merged
merged 1 commit into from
May 4, 2017
Merged

Remove .pot file again #646

merged 1 commit into from
May 4, 2017

Conversation

nylen
Copy link
Member

@nylen nylen commented May 4, 2017

This was removed in #614 and accidentally re-introduced later in #603, which was merged afterwards.

@nylen nylen merged commit 5bd035d into master May 4, 2017
@nylen nylen deleted the remove/pot-file-again branch May 4, 2017 05:56
@aduth
Copy link
Member

aduth commented May 4, 2017

Hmm, shouldn't the .gitignore entry have prevented it from being reintroduced?

https://github.com/WordPress/gutenberg/blob/2e68306/.gitignore#L3

Or is this not an expected behavior when merging a branch that is older than the gitignore changes?

@nylen
Copy link
Member Author

nylen commented May 4, 2017

I'm not entirely sure how that all works, but apparently simply having the .gitignore entry isn't always enough. (I guess I can think of a few ways to commit ignored files to a repository if you try hard enough, and now we know one more.)

Also I could've prevented this anyway by looking more closely at the changes in #603 before I merged it.

@BE-Webdesign
Copy link
Contributor

I should have noticed myself since I did the last rebase. I will try and pay more close attention in the future before asking for a merge.

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