Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitb25ec96

Browse files
committed
[Contributing] Replace mentions of 2.2 for 2.3
As per WouterJ request:#3421 (comment)
1 parent70ed645 commitb25ec96

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

‎contributing/code/patches.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,13 @@ Choose the right Branch
107107
Before working on a patch, you must determine on which branch you need to
108108
work. The branch should be based on the ``master`` branch if you want to add a
109109
new feature. But if you want to fix a bug, use the oldest but still maintained
110-
version of Symfony where the bug happens (like ``2.2``).
110+
version of Symfony where the bug happens (like ``2.3``).
111111

112112
..note::
113113

114114
All bug fixes merged into maintenance branches are also merged into more
115115
recent branches on a regular basis. For instance, if you submit a patch
116-
for the ``2.2`` branch, the patch will also be applied by the core team on
116+
for the ``2.3`` branch, the patch will also be applied by the core team on
117117
the ``master`` branch.
118118

119119
Create a Topic Branch
@@ -126,18 +126,18 @@ topic branch:
126126
127127
$ git checkout -b BRANCH_NAME master
128128
129-
Or, if you want to provide a bugfix for the ``2.2`` branch, first track the remote
130-
``2.2`` branch locally:
129+
Or, if you want to provide a bugfix for the ``2.3`` branch, first track the remote
130+
``2.3`` branch locally:
131131

132132
..code-block::bash
133133
134-
$ git checkout -t origin/2.2
134+
$ git checkout -t origin/2.3
135135
136-
Then create a new branch off the ``2.2`` branch to work on the bugfix:
136+
Then create a new branch off the ``2.3`` branch to work on the bugfix:
137137

138138
..code-block::bash
139139
140-
$ git checkout -b BRANCH_NAME 2.2
140+
$ git checkout -b BRANCH_NAME 2.3
141141
142142
..tip::
143143

@@ -228,7 +228,7 @@ while to finish your changes):
228228
229229
..tip::
230230

231-
Replace ``master`` with the branch you selected previously (e.g. ``2.2``)
231+
Replace ``master`` with the branch you selected previously (e.g. ``2.3``)
232232
if you are working on a bugfix
233233

234234
When doing the ``rebase`` command, you might have to fix merge conflicts.
@@ -253,8 +253,8 @@ You can now make a pull request on the ``symfony/symfony`` Github repository.
253253

254254
..tip::
255255

256-
Take care to point your pull request towards ``symfony:2.2`` if you want
257-
the core team to pull a bugfix based on the ``2.2`` branch.
256+
Take care to point your pull request towards ``symfony:2.3`` if you want
257+
the core team to pull a bugfix based on the ``2.3`` branch.
258258

259259
To ease the core team work, always include the modified components in your
260260
pull request message, like in:

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp