@@ -134,9 +134,9 @@ original contributor.
134
134
$ cd symfony-docs/
135
135
136
136
# make sure that your local branch is updated
137
- $ git checkout 3 .4
137
+ $ git checkout 4 .4
138
138
$ git fetch upstream
139
- $ git merge upstream/3 .4
139
+ $ git merge upstream/4 .4
140
140
141
141
# merge any PR passing its GitHub number as argument
142
142
$ gh merge 11159
@@ -153,20 +153,20 @@ the ``-s`` option:
153
153
154
154
.. code-block :: terminal
155
155
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
158
158
159
159
Sometimes, when changing the branch, you may face rebase issues, but they are
160
160
usually simple to fix:
161
161
162
162
.. code-block :: terminal
163
163
164
- $ gh merge 11160 -s 3 .4
164
+ $ gh merge 11160 -s 4 .4
165
165
166
166
...
167
167
168
168
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.
170
170
Exit Code: 128(Invalid exit argument)
171
171
172
172
[...]
@@ -183,7 +183,7 @@ usually simple to fix:
183
183
184
184
# Lastly, re-run the exact same original command that resulted in a conflict
185
185
# 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
187
187
188
188
The previous run had some conflicts. Do you want to resume the merge? (Y/n)
189
189
@@ -195,29 +195,29 @@ Step 3: Merge it into the other branches
195
195
196
196
If a PR has not been merged in ``master ``, you must merge it up into all the
197
197
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 ``:
199
199
200
200
.. code-block :: terminal
201
201
202
202
$ git fetch upstream
203
203
204
- $ git checkout 3 .4
205
- $ git merge upstream/3 .4
204
+ $ git checkout 4 .4
205
+ $ git merge upstream/4 .4
206
206
207
207
$ gh merge 11159
208
208
$ git push origin
209
209
$ git push upstream
210
210
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
214
214
# here you can face several errors explained later
215
215
$ git push origin
216
216
$ git push upstream
217
217
218
218
$ git checkout master
219
219
$ git merge upstream/master
220
- $ git merge --log 4.4
220
+ $ git merge --log 5.0
221
221
$ git push origin
222
222
$ git push upstream
223
223
@@ -247,26 +247,26 @@ When updating your local branches before merging:
247
247
.. code-block :: terminal
248
248
249
249
$ 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
252
252
253
253
It's possible that you merge a wrong upstream branch unawarely. It's usually
254
254
easy to spot because you'll see lots of conflicts:
255
255
256
256
.. code-block :: terminal
257
257
258
258
# 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
261
261
262
262
As long as you don't push this wrong merge, there's no problem. Delete your
263
263
local branch and check it out again:
264
264
265
265
.. code-block :: terminal
266
266
267
267
$ 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
270
270
271
271
If you did push the wrong branch merge, ask for help in the documentation
272
272
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:
278
278
279
279
.. code-block :: terminal
280
280
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
284
284
285
285
Auto-merging security/entity_provider.rst
286
286
Auto-merging logging/monolog_console.rst
@@ -314,13 +314,13 @@ were modified by the PR but no longer exist in newer branches:
314
314
315
315
.. code-block :: terminal
316
316
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
320
320
321
321
Auto-merging translation/debug.rst
322
322
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.
324
324
Auto-merging service_container.rst
325
325
326
326
If the contents of the deleted file were moved to a different file in newer
0 commit comments