Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

A set of small typos#4130

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

Closed
Baptouuuu wants to merge5 commits intosymfony:masterfromBaptouuuu:typos
Closed

A set of small typos#4130

Baptouuuu wants to merge5 commits intosymfony:masterfromBaptouuuu:typos

Conversation

@Baptouuuu
Copy link
Contributor

QA
Doc fix?yes
New docs?no
Applies to2.3+
Fixed tickets

@Baptouuuu
Copy link
ContributorAuthor

Oops, the target branch should be2.5 notmaster.

@BaptouuuuBaptouuuu changed the title[WCM] A set of small typosA set of small typosAug 16, 2014
@xabbuh
Copy link
Member

@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

Great fixes!

However, almost all of the fixes in this PR should be merged in the 2.3 branch, except from the change incomponents/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
ContributorAuthor

@wouterj done.

@xabbuh
Copy link
Member

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. Assumingorigin is theBaptouuuu/symfony repo andupstream is what you calledsymfony/symfony, it should be something like:

git fetch upstreamgit checkout typosgit rebase --onto upstream/2.3 upstream/mastergit push origin typos --force

Thanks!

@weaverryanweaverryan mentioned this pull requestAug 16, 2014
@Baptouuuu
Copy link
ContributorAuthor

@weaverryan done

@weaverryan
Copy link
Member

Yes! This merged into 2.3 perfectly. Thanks Baptiste!

Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@Baptouuuu@xabbuh@wouterj@weaverryan
[8]ページ先頭
©2009-2025 Movatter.jp