Skip to content

Fixed typos (2.2) #2084

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
Jan 3, 2013
Merged

Fixed typos (2.2) #2084

merged 1 commit into from
Jan 3, 2013

Conversation

unkind
Copy link
Contributor

@unkind unkind commented Dec 31, 2012

This PR affects some new files, so I can't base my changes on 2.0/2.1 branches.

@wouterj
Copy link
Member

wouterj commented Jan 1, 2013

The old files should be merged up to the 2.0 branch, the new files only in 2.1 or master, great catches through!

@unkind
Copy link
Contributor Author

unkind commented Jan 1, 2013

The old files should be merged up to the 2.0 branch, the new files only in 2.1 or master

Well, I don't see any solution except 3 PRs (for 2.0, 2.1 and master), but it looks ugly. Do you have any ideas?

@wouterj
Copy link
Member

wouterj commented Jan 1, 2013

@unkind you can leave it what it is right now, but the next time you should create 3 PRs. You should fix all general typos in 2.0, typos in new files for 2.1 in 2.1 and typos new in 2.2 in the master branch.

If @weaverryan merges your PR, he will backport the 2.0 changes to the 2.0 branch.

This was referenced Jan 1, 2013
weaverryan added a commit that referenced this pull request Jan 3, 2013
@weaverryan weaverryan merged commit 40b2858 into symfony:master Jan 3, 2013
@weaverryan
Copy link
Member

@unkind really nice catches, and you made merging this much much easier by backporting to the other branches - thank you very much!

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.

3 participants