@@ -29,9 +29,9 @@ Initial Set-up
29
29
git remote add upstream https://github.com/xdebug/xdebug.git
30
30
git fetch upstream
31
31
32
- - Add a tracking branch for Xdebug 3.3 ::
32
+ - Add a tracking branch for Xdebug 3.4 ::
33
33
34
- git checkout --track origin/xdebug_3_3
34
+ git checkout --track origin/xdebug_3_4
35
35
36
36
Branches
37
37
--------
@@ -40,18 +40,18 @@ There are two branches in operation:
40
40
41
41
``master ``
42
42
This is were all new feature Pull Requests should be targeted at
43
- ``xdebug_3_3 ``
43
+ ``xdebug_3_4 ``
44
44
This is were all bug fix Pull Requests should be targeted at. The
45
45
maintainer will add them to ``master `` too when merging the Pull Request.
46
46
47
47
Working on a Pull Request
48
48
-------------------------
49
49
50
- - Make sure that your ``master `` and ``xdebug_3_3 `` branches are up to date
50
+ - Make sure that your ``master `` and ``xdebug_3_4 `` branches are up to date
51
51
with the ``upstream `` repository.
52
52
- Create an issue in the `issue tracker <https://bugs.xdebug.org >`_ (if none
53
53
exists yet).
54
- - Switch to the right target branch (``master `` for features, ``xdebug_3_3 ``
54
+ - Switch to the right target branch (``master `` for features, ``xdebug_3_4 ``
55
55
for bug fixes).
56
56
- Create a feature branch::
57
57
@@ -89,7 +89,7 @@ Working on a Pull Request
89
89
will be targeting, for example to rebase against the current bug fix
90
90
branch::
91
91
92
- git fetch upstream && git rebase upstream/xdebug_3_3
92
+ git fetch upstream && git rebase upstream/xdebug_3_4
93
93
94
94
- Push your changes to your remote repository::
95
95
0 commit comments