Skip to content

Commit e31722d

Browse files
committed
minor #13175 Use valid version in maintainer guide (OskarStark)
This PR was merged into the 3.4 branch. Discussion ---------- Use valid version in maintainer guide <!-- If your pull request fixes a BUG, use the oldest maintained branch that contains the bug (see https://symfony.com/roadmap for the list of maintained branches). If your pull request documents a NEW FEATURE, use the same Symfony branch where the feature was introduced (and `master` for features of unreleased versions). --> Commits ------- 2a596de Use valid version in maintainer guide
2 parents 04562c0 + 2a596de commit e31722d

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

_build/maintainer_guide.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ usually simple to fix:
166166
...
167167
168168
Unable to rebase the patch for <comment>pull/11183</comment>
169-
The command "'git' 'rebase' '--onto' '3.4' '4.2' 'pull/11160'" failed.
169+
The command "'git' 'rebase' '--onto' '3.4' '4.4' 'pull/11160'" failed.
170170
Exit Code: 128(Invalid exit argument)
171171
172172
[...]
@@ -195,7 +195,7 @@ 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.2`` and ``master``:
198+
``3.4`` and the maintained branches are ``3.4``, ``4.4`` and ``master``:
199199

200200
.. code-block:: terminal
201201
@@ -208,16 +208,16 @@ maintained branches until ``master``. Imagine that you are merging a PR against
208208
$ git push origin
209209
$ git push upstream
210210
211-
$ git checkout 4.2
212-
$ git merge upstream/4.2
211+
$ git checkout 4.4
212+
$ git merge upstream/4.4
213213
$ git merge --log 3.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.2
220+
$ git merge --log 4.4
221221
$ git push origin
222222
$ git push upstream
223223
@@ -257,7 +257,7 @@ easy to spot because you'll see lots of conflicts:
257257
258258
# DON'T DO THIS! It's a wrong branch merge
259259
$ git checkout 3.4
260-
$ git merge upstream/4.2
260+
$ git merge upstream/4.4
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:
@@ -278,8 +278,8 @@ When merging things to upper branches, most of the times you'll see conflicts:
278278

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

315315
.. code-block:: terminal
316316
317-
$ git checkout 4.2
318-
$ git merge upstream/4.2
317+
$ git checkout 4.4
318+
$ git merge upstream/4.4
319319
$ git merge --log 3.4
320320
321321
Auto-merging translation/debug.rst

0 commit comments

Comments
 (0)