8000 [2.1] Fixed composer.json by hason · Pull Request #6201 · symfony/symfony · GitHub
[go: up one dir, main page]

Skip to content

[2.1] Fixed composer.json #6201

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

Merged
merged 1 commit into from
Dec 6, 2012
Merged

Conversation

hason
Copy link
Contributor
@hason hason commented Dec 6, 2012

No description provided.

@fabpot
Copy link
Member
fabpot commented Dec 6, 2012

Why is is useless?

@hason
Copy link
Contributor Author
hason commented Dec 6, 2012

Because the dev-master branch is alias for 2.2-dev as mentioned @stof in #6196 (comment).

@fabpot
Copy link
Member
fabpot commented Dec 6, 2012

got it now. Can you fix your PR as there are some unrelated commits? Thanks.

@hason
Copy link
Contributor Author
hason commented Dec 6, 2012

I backported some "unrelated" commits for better usage with composer. Should I remove these?

@fabpot
Copy link
Member
fabpot commented Dec 6, 2012

We do not backport things. So, please, remove them.

@hason
Copy link
Contributor Author
hason commented Dec 6, 2012

done

fabpot added a commit that referenced this pull request Dec 6, 2012
This PR was merged into the 2.1 branch.

Commits
-------

10e5f3b Removed useless branch alias for dev-master in composer.json

Discussion
----------

[2.1] Fixed composer.json

---------------------------------------------------------------------------

by fabpot at 2012-12-06T08:23:35Z

Why is is useless?

---------------------------------------------------------------------------

by hason at 2012-12-06T08:30:58Z

Because the ``dev-master`` branch is alias for ``2.2-dev`` as mentioned @stof in #6196 (comment).

---------------------------------------------------------------------------

by fabpot at 2012-12-06T08:33:42Z

got it now. Can you fix your PR as there are some unrelated commits? Thanks.

---------------------------------------------------------------------------

by hason at 2012-12-06T09:02:50Z

I backported some "unrelated" commits for better usage with composer. Should I remove these?

---------------------------------------------------------------------------

by fabpot at 2012-12-06T09:05:45Z

We do not backport things. So, please, remove them.

---------------------------------------------------------------------------

by hason at 2012-12-06T10:02:08Z

done
@fabpot fabpot merged commit 10e5f3b into symfony:2.1 Dec 6, 2012
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.

2 participants
0