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

chore: Ignore composer.lock #331

Merged
merged 1 commit into from
Nov 22, 2020

Conversation

pvgnd
Copy link
Contributor

@pvgnd pvgnd commented Nov 21, 2020

Context

composer.lock should never been commited to Git repository

What has been done

  • composer.lock has been added to .gitignore

@JeroenVanOort
Copy link
Member

Didn't you mean to also remove composer.lock from the repository?

@pvgnd
Copy link
Contributor Author

pvgnd commented Nov 21, 2020

oh right, I didn't notice the root composer.lock
My first intention was to exclude composer.lock created in integration tests dir

@JeroenVanOort
Copy link
Member

At this moment, I expect Travis to fail, but not because of your change. Please have a little more patience while I'm figuring out #332 .

@JeroenVanOort
Copy link
Member

If you could rebase against current master, I will merge asap.

@pvgnd
Copy link
Contributor Author

pvgnd commented Nov 22, 2020

done

@JeroenVanOort JeroenVanOort merged commit d280fef into php-vcr:master Nov 22, 2020
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.

None yet

2 participants