Stable branches can't be merged to master

[symfony-fr]

Stable branches can't be merged to master

[michaelperrin]

Hi @gregquat, any news on this?
How contributions should be made? Should they be all on the master branch as it's being done now?

I don't think it's appropriate as current versions of Symfony don't benefit from the fixes.

[michaelperrin]

As it would be too complicated to merge version specific branches to master and fixes made in master to version specific branches due to the number of conflicts, I propose this:

• Do not maintain anymore the 2.0, 2.1, 2.2 branches of the documentation, as 2.0, 2.1 are not maintained versions anymore. 2.2 version is still maintained till 05/2014 but due to the many conflicts, we can focus on the 2.3 LTS version and new coming or existing versions like 2.4.
• Merge master to 2.3 and resolve conflicts by keeping the master side: it seems that there isn't any 2.4+ specific documentation in the current master branch. So we get the 2.3 branch back on track.
• When it's done, make sure that any new PR are made on the 2.3 branch (or 2.4 if it's about a feature specific to this version). This branches will be regularly be merged back to master.

This way, we will have the same branching model as the English docs, won't have diverging branches, and have updated documentation not only on master but also on the current versions branches.

[gregquat]

I don't know how I can discover this issue just now... Sorry again.

I think we whould "maintain" 2.1 and 2.2 branches (2.0 does not exist in French). I just want to fix typo and some code. As much as possible.

I'm agree to focus on 2.3 LTS. I would like this branch to be up to date but I do not have enough time to translate and check the modifications from the English branch. Every change in English has to be done by hand, and it takes lot of time.

I'm not a GIT expert, so if you have any good solution, I'll take it. If I just can merge PR from a branch to another, I would be the happiest man.

Thank you!

[michaelperrin]

Hi @gregquat . Sorry for the late answer (no problem for yours).

I'm going to focus first on the 2.3 version documentation. It means that The 2.3 branch will be up to date and have the possibility to be merged back to master. It will be pretty easy to do.
A pull request will be opened for this purpose.

Then, I will focus on the 2.2 branch. Again this means that the 2.2 branch will have the possibility to be merged back to master. An other PR will be opened for this, a bit later.

When these 2 steps are done, any PR made directly on master will be refused (and we will gently ask to make the PR on the right branch). And we will be back on track, at least for maintained versions of Symfony!

I keep you posted on this.

[gregquat]

Hello @michaelperrin. As you said, the priority is the master and the 2.3 branch.
I think you can give up the 2.1, I will handle it by hand.

Thank you for your work and I'm waiting for your PR

[michaelperrin]

Ok so now that #369 has been merged, this ticket can be closed.

My PR included the merge from 2.2 to 2.3 and master to 2.3 (as there wasn't anything specific to version 2.4+), so we now both 2.2 and 2.3 branches can be merged back to master.

New Pull Requests can now and should be directly made on branch 2.2, or on branch 2.3 if it's something specific to Symfony 2.3.

Thanks for your help @gregquat !

[gregquat]

No, thanks for YOUR help. I should have done that many weeks ago...
My job is easier thanks to you now.