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

Already on GitHub? Sign in to your account

Remove .pot file again #646

Merged
merged 1 commit into from May 4, 2017

Conversation

Projects
None yet
3 participants
Collaborator

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

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@nylen nylen deleted the remove/pot-file-again branch May 4, 2017

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?

Collaborator

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.

Collaborator

BE-Webdesign commented May 5, 2017

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