@@ -107,13 +107,13 @@ Choose the right Branch
107
107
Before working on a patch, you must determine on which branch you need to
108
108
work. The branch should be based on the `master ` branch if you want to add a
109
109
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.1 `).
110
+ version of Symfony where the bug happens (like `2.2 `).
111
111
112
112
.. note ::
113
113
114
114
All bug fixes merged into maintenance branches are also merged into more
115
115
recent branches on a regular basis. For instance, if you submit a patch
116
- for the `2.1 ` branch, the patch will also be applied by the core team on
116
+ for the `2.2 ` branch, the patch will also be applied by the core team on
117
117
the `master ` branch.
118
118
119
119
Create a Topic Branch
@@ -126,18 +126,18 @@ topic branch:
126
126
127
127
$ git checkout -b BRANCH_NAME master
128
128
129
- Or, if you want to provide a bugfix for the 2.1 branch, first track the remote
130
- `2.1 ` branch locally:
129
+ Or, if you want to provide a bugfix for the 2.2 branch, first track the remote
130
+ `2.2 ` branch locally:
131
131
132
132
.. code-block :: bash
133
133
134
- $ git checkout -t origin/2.1
134
+ $ git checkout -t origin/2.2
135
135
136
- Then create a new branch off the 2.1 branch to work on the bugfix:
136
+ Then create a new branch off the 2.2 branch to work on the bugfix:
137
137
138
138
.. code-block :: bash
139
139
140
- $ git checkout -b BRANCH_NAME 2.1
140
+ $ git checkout -b BRANCH_NAME 2.2
141
141
142
142
.. tip ::
143
143
@@ -230,7 +230,7 @@ while to finish your changes):
230
230
231
231
.. tip ::
232
232
233
- Replace `master ` with `2.1 ` if you are working on a bugfix
233
+ Replace `master ` with `2.2 ` if you are working on a bugfix
234
234
235
235
When doing the ``rebase `` command, you might have to fix merge conflicts.
236
236
``git status `` will show you the *unmerged * files. Resolve all the conflicts,
@@ -254,8 +254,8 @@ You can now make a pull request on the ``symfony/symfony`` Github repository.
254
254
255
255
.. tip ::
256
256
257
- Take care to point your pull request towards ``symfony:2.1 `` if you want
258
- the core team to pull a bugfix based on the 2.1 branch.
257
+ Take care to point your pull request towards ``symfony:2.2 `` if you want
258
+ the core team to pull a bugfix based on the 2.2 branch.
259
259
260
260
To ease the core team work, always include the modified components in your
261
261
pull request message, like in:
0 commit comments