@@ -166,7 +166,7 @@ usually simple to fix:
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.2 ' 'pull/11160'" failed.
169
+ The command "'git' 'rebase' '--onto' '3.4' '4.4 ' 'pull/11160'" failed.
170
170
Exit Code: 128(Invalid exit argument)
171
171
172
172
[...]
@@ -195,7 +195,7 @@ 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.2 `` and ``master ``:
198
+ ``3.4 `` and the maintained branches are ``3.4 ``, ``4.4 `` and ``master ``:
199
199
200
200
.. code-block :: terminal
201
201
@@ -208,16 +208,16 @@ maintained branches until ``master``. Imagine that you are merging a PR against
208
208
$ git push origin
209
209
$ git push upstream
210
210
211
- $ git checkout 4.2
212
- $ git merge upstream/4.2
211
+ $ git checkout 4.4
212
+ $ git merge upstream/4.4
213
213
$ git merge --log 3.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.2
220
+ $ git merge --log 4.4
221
221
$ git push origin
222
222
$ git push upstream
223
223
@@ -257,7 +257,7 @@ easy to spot because you'll see lots of conflicts:
257
257
258
258
# DON'T DO THIS! It's a wrong branch merge
259
259
$ git checkout 3.4
260
- $ git merge upstream/4.2
260
+ $ git merge upstream/4.4
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:
@@ -278,8 +278,8 @@ 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.2
282
- $ git merge upstream/4.2
281
+ $ git checkout 4.4
282
+ $ git merge upstream/4.4
283
283
$ git merge --log 3.4
284
284
285
285
Auto-merging security/entity_provider.rst
@@ -314,8 +314,8 @@ 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.2
318
- $ git merge upstream/4.2
317
+ $ git checkout 4.4
318
+ $ git merge upstream/4.4
319
319
$ git merge --log 3.4
320
320
321
321
Auto-merging translation/debug.rst
0 commit comments