fix doubled words#2658

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Jump to bottom

Merged

weaverryan merged 1 commit intosymfony:2.2fromjbafford:doubled-words-22

May 26, 2013

Merged

fix doubled words#2658

weaverryan merged 1 commit intosymfony:2.2fromjbafford:doubled-words-22

May 26, 2013

Conversation

Copy link

Contributor

jbafford commentedMay 23, 2013

Q	A
Doc fix?	yes
New docs?	no
Applies to	2.2+
Fixed tickets	n/a

Suggest applying after PR#2657, which includes typo fixes applicable to both 2.1 and 2.2+.

fix doubled words

0fb6de3

Copy link

TroodoNmike commentedMay 25, 2013

👍

Copy link

Member

lyrixx commentedMay 26, 2013

👎 The branch 2.1 will be merged in 2.2. (and 2.2 in 2.3, and so on). So only PR against 2.1 is useful.
You can close this one, but leave open#2657

Copy link

ContributorAuthor

jbafford commentedMay 26, 2013

@lyrixx:#2657 has fixes that apply to both 2.1 and 2.2+.#2658 has a fix that only applies only to 2.2+; it does not include the fixes in#2657. Both should still be merged.

Copy link

Member

wouterj commentedMay 26, 2013

👍

weaverryan added a commit that referenced this pull request

May 26, 2013

Merge pull request#2658from jbafford/doubled-words-22

4618929

fix doubled words

weaverryan merged commit4618929 intosymfony:2.2

May 26, 2013

Copy link

Member

weaverryan commentedMay 26, 2013

Thanks again John - perfectly executed PR's, and very clear instructions on why you broke things up. It can be a bit confusing now that we have many branches :).