@nykopol - this looks good. It'll need a rebase (it contains some duplicated changes from#3407) - but keep going! :)

@weaverryan yes it's my mistake i did not start in an other branch. When you say a 'rebase' you think a new PR ?

Hey@nykopol!

No problem :). You can actually rebase youroverridden_options branch and then force push right back to it. Assumingupstream is the remote name forsymfony/symfony-docs andorigin is to your fork, something like:

git checkout overridden_optionsgit fetch upstreamgit rebase upstream/mastergit push origin overridden_options --force

As soon as you push to theoverridden_options branch on your fork, those commits will show up here. You'll need to fix some conflicts after runningrebase.

Cheers!

Thanks@weaverryan for you help. I don't had conflict on rebase but on push. I hope it's ok now.

Sorry@nykopol it's still conflicting.

Hey@nykopol!

Yea, it's still conflicting unfortunately :). Did you fetch from the "symfony/symfony-docs" repository and rebase againstits master?

Let me know! Thanks!

Hi guys!

I've rebased and re-opened this PR at#3506 for review. I'll close this :).

Thanks!