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

Composer tilde #591

Merged
merged 2 commits into from Feb 5, 2013
Merged

Composer tilde #591

merged 2 commits into from Feb 5, 2013

Conversation

staabm
Copy link
Member

@staabm staabm commented Feb 2, 2013

updated composer.json to use tilde operator. this change introduces the latest stable minor version 2.4.14 of phing to propel.

@staabm
Copy link
Member Author

staabm commented Feb 2, 2013

hmm need a rebase, ....

@willdurand
Copy link
Contributor

I guess yes ;)

William Durand | http://www.williamdurand.fr

On Sun, Feb 3, 2013 at 12:36 AM, Markus Staab notifications@github.comwrote:

hmm need a rebase, ....


Reply to this email directly or view it on GitHubhttps://github.com//pull/591#issuecomment-13039408.

@@ -7,3 +7,4 @@ test/fixtures/treetest/build/
vendor/
composer.lock
composer.phar
.idea/
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 ;o)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-5 Please don't add such stuff to project .gitignore.
This is stuff that belongs to your users ~/.gitignore!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reverted

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@marcj, @staabm Please see http://git-scm.com/docs/gitignore on how to set up those correctly :-)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@havvg, oh, thanks! yay, you never stop learning :-)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@havvg thanks for pointing to this neat feature!

@staabm
Copy link
Member Author

staabm commented Feb 2, 2013

woar, I need more practice with rebase.. have to do more pull requests in the future to get more used to it ;). here we go..

willdurand added a commit that referenced this pull request Feb 5, 2013
@willdurand willdurand merged commit 505fe25 into propelorm:master Feb 5, 2013
@willdurand
Copy link
Contributor

thanks! I hope Phing won't introduce BC breaks though.

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

4 participants