@@ -129,7 +129,7 @@ work:
129
129
</contributing/code/maintenance>` (you may have to choose a higher branch if
130
130
the feature you are fixing was introduced in a later version);
131
131
132
- * ``master ``, if you are adding a new feature.
132
+ * ``5.x ``, if you are adding a new feature.
133
133
134
134
The only exception is when a new :doc: `major Symfony version </contributing/community/releases >`
135
135
(4.0, 5.0, etc.) comes out every two years. Because of the
@@ -142,7 +142,7 @@ work:
142
142
All bug fixes merged into maintenance branches are also merged into more
143
143
recent branches on a regular basis. For instance, if you submit a PR
144
144
for the ``3.4 `` branch, the PR will also be applied by the core team on
145
- the ``master `` branch.
145
+ the ``5.x `` branch.
146
146
147
147
Create a Topic Branch
148
148
~~~~~~~~~~~~~~~~~~~~~
@@ -152,7 +152,7 @@ topic branch:
152
152
153
153
.. code-block :: terminal
154
154
155
- $ git checkout -b BRANCH_NAME master
155
+ $ git checkout -b BRANCH_NAME 5.x
156
156
157
157
Or, if you want to provide a bug fix for the ``3.4 `` branch, first track the remote
158
158
``3.4 `` branch locally:
@@ -277,15 +277,15 @@ while to finish your changes):
277
277
278
278
.. code-block :: terminal
279
279
280
- $ git checkout master
280
+ $ git checkout 5.x
281
281
$ git fetch upstream
282
- $ git merge upstream/master
282
+ $ git merge upstream/5.x
283
283
$ git checkout BRANCH_NAME
284
- $ git rebase master
284
+ $ git rebase 5.x
285
285
286
286
.. tip ::
287
287
288
- Replace ``master `` with the branch you selected previously (e.g. ``3.4 ``)
288
+ Replace ``5.x `` with the branch you selected previously (e.g. ``3.4 ``)
289
289
if you are working on a bug fix.
290
290
291
291
When doing the ``rebase `` command, you might have to fix merge conflicts.
@@ -402,12 +402,12 @@ Rework your Pull Request
402
402
~~~~~~~~~~~~~~~~~~~~~~~~
403
403
404
404
Based on the feedback on the pull request, you might need to rework your
405
- PR. Before re-submitting the PR, rebase with ``upstream/master `` or
405
+ PR. Before re-submitting the PR, rebase with ``upstream/5.x `` or
406
406
``upstream/3.4 ``, don't merge; and force the push to the origin:
407
407
408
408
.. code-block :: terminal
409
409
410
- $ git rebase -f upstream/master
410
+ $ git rebase -f upstream/5.x
411
411
$ git push --force origin BRANCH_NAME
412
412
413
413
.. note ::
0 commit comments