Skip to content

Commit f7b5f32

Browse files
committed
Use valid versionj in maintainer guide. refs #13175
1 parent 38d663a commit f7b5f32

File tree

1 file changed

+27
-27
lines changed

1 file changed

+27
-27
lines changed

_build/maintainer_guide.rst

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,9 @@ original contributor.
134134
$ cd symfony-docs/
135135
136136
# make sure that your local branch is updated
137-
$ git checkout 3.4
137+
$ git checkout 4.4
138138
$ git fetch upstream
139-
$ git merge upstream/3.4
139+
$ git merge upstream/4.4
140140
141141
# merge any PR passing its GitHub number as argument
142142
$ gh merge 11159
@@ -153,20 +153,20 @@ the ``-s`` option:
153153

154154
.. code-block:: terminal
155155
156-
# e.g. this PR was sent against 'master', but it's merged in '3.4'
157-
$ gh merge 11160 -s 3.4
156+
# e.g. this PR was sent against 'master', but it's merged in '4.4'
157+
$ gh merge 11160 -s 4.4
158158
159159
Sometimes, when changing the branch, you may face rebase issues, but they are
160160
usually simple to fix:
161161

162162
.. code-block:: terminal
163163
164-
$ gh merge 11160 -s 3.4
164+
$ gh merge 11160 -s 4.4
165165
166166
...
167167
168168
Unable to rebase the patch for <comment>pull/11183</comment>
169-
The command "'git' 'rebase' '--onto' '3.4' '4.4' 'pull/11160'" failed.
169+
The command "'git' 'rebase' '--onto' '4.4' '5.0' 'pull/11160'" failed.
170170
Exit Code: 128(Invalid exit argument)
171171
172172
[...]
@@ -183,7 +183,7 @@ usually simple to fix:
183183
184184
# Lastly, re-run the exact same original command that resulted in a conflict
185185
# There's no need to change the branch or do anything else.
186-
$ gh merge 11160 -s 3.4
186+
$ gh merge 11160 -s 4.4
187187
188188
The previous run had some conflicts. Do you want to resume the merge? (Y/n)
189189
@@ -195,29 +195,29 @@ Step 3: Merge it into the other branches
195195

196196
If a PR has not been merged in ``master``, you must merge it up into all the
197197
maintained branches until ``master``. Imagine that you are merging a PR against
198-
``3.4`` and the maintained branches are ``3.4``, ``4.4`` and ``master``:
198+
``4.4`` and the maintained branches are ``4.4``, ``5.0`` and ``master``:
199199

200200
.. code-block:: terminal
201201
202202
$ git fetch upstream
203203
204-
$ git checkout 3.4
205-
$ git merge upstream/3.4
204+
$ git checkout 4.4
205+
$ git merge upstream/4.4
206206
207207
$ gh merge 11159
208208
$ git push origin
209209
$ git push upstream
210210
211-
$ git checkout 4.4
212-
$ git merge upstream/4.4
213-
$ git merge --log 3.4
211+
$ git checkout 5.0
212+
$ git merge upstream/5.0
213+
$ git merge --log 4.4
214214
# here you can face several errors explained later
215215
$ git push origin
216216
$ git push upstream
217217
218218
$ git checkout master
219219
$ git merge upstream/master
220-
$ git merge --log 4.4
220+
$ git merge --log 5.0
221221
$ git push origin
222222
$ git push upstream
223223
@@ -247,26 +247,26 @@ When updating your local branches before merging:
247247
.. code-block:: terminal
248248
249249
$ git fetch upstream
250-
$ git checkout 3.4
251-
$ git merge upstream/3.4
250+
$ git checkout 4.4
251+
$ git merge upstream/4.4
252252
253253
It's possible that you merge a wrong upstream branch unawarely. It's usually
254254
easy to spot because you'll see lots of conflicts:
255255

256256
.. code-block:: terminal
257257
258258
# DON'T DO THIS! It's a wrong branch merge
259-
$ git checkout 3.4
260-
$ git merge upstream/4.4
259+
$ git checkout 4.4
260+
$ git merge upstream/5.0
261261
262262
As long as you don't push this wrong merge, there's no problem. Delete your
263263
local branch and check it out again:
264264

265265
.. code-block:: terminal
266266
267267
$ git checkout master
268-
$ git branch -D 3.4
269-
$ git checkout 3.4 upstream/3.4
268+
$ git branch -D 4.4
269+
$ git checkout 4.4 upstream/4.4
270270
271271
If you did push the wrong branch merge, ask for help in the documentation
272272
mergers chat and we'll help solve the problem.
@@ -278,9 +278,9 @@ When merging things to upper branches, most of the times you'll see conflicts:
278278

279279
.. code-block:: terminal
280280
281-
$ git checkout 4.4
282-
$ git merge upstream/4.4
283-
$ git merge --log 3.4
281+
$ git checkout 5.0
282+
$ git merge upstream/5.0
283+
$ git merge --log 4.4
284284
285285
Auto-merging security/entity_provider.rst
286286
Auto-merging logging/monolog_console.rst
@@ -314,13 +314,13 @@ were modified by the PR but no longer exist in newer branches:
314314

315315
.. code-block:: terminal
316316
317-
$ git checkout 4.4
318-
$ git merge upstream/4.4
319-
$ git merge --log 3.4
317+
$ git checkout 5.0
318+
$ git merge upstream/5.0
319+
$ git merge --log 4.4
320320
321321
Auto-merging translation/debug.rst
322322
CONFLICT (modify/delete): service_container/scopes.rst deleted in HEAD and
323-
modified in 3.4. Version 3.4 of service_container/scopes.rst left in tree.
323+
modified in 4.4. Version 4.4 of service_container/scopes.rst left in tree.
324324
Auto-merging service_container.rst
325325
326326
If the contents of the deleted file were moved to a different file in newer

0 commit comments

Comments
 (0)