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

A set of small typos #4130

Closed
wants to merge 5 commits into from
Closed

A set of small typos #4130

wants to merge 5 commits into from

Conversation

Baptouuuu
Copy link
Contributor

Q A
Doc fix? yes
New docs? no
Applies to 2.3+
Fixed tickets

@Baptouuuu
Copy link
Contributor Author

Oops, the target branch should be 2.5 not master.

@Baptouuuu Baptouuuu changed the title [WCM] A set of small typos A set of small typos Aug 16, 2014
@xabbuh
Copy link
Member

xabbuh commented Aug 16, 2014

@Baptouuuu These are really nice catches! 👍 And don't worry about the target branch. @weaverryan can easily apply the changes to the right branch.

@wouterj
Copy link
Member

wouterj commented Aug 16, 2014

Great fixes!

However, almost all of the fixes in this PR should be merged in the 2.3 branch, except from the change in components/dependency_injection/advanced. Can you please remove that change from this PR and create a new PR based on the 2.5 branch for that change? Thank you!

@Baptouuuu
Copy link
Contributor Author

@wouterj done.

@xabbuh
Copy link
Member

xabbuh commented Aug 16, 2014

Thanks @Baptouuuu

@weaverryan
Copy link
Member

Hey @Baptouuuu!

I need to merge this into the 2.3 branch, but it's not merging cleanly. If you can rebase this against the 2.3 branch and re-push (not need to open a new PR), then I can merge it in. Assuming origin is the Baptouuuu/symfony repo and upstream is what you called symfony/symfony, it should be something like:

git fetch upstream
git checkout typos
git rebase --onto upstream/2.3 upstream/master
git push origin typos --force

Thanks!

@Baptouuuu
Copy link
Contributor Author

@weaverryan done

@weaverryan
Copy link
Member

Yes! This merged into 2.3 perfectly. Thanks Baptiste!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants