Skip to content

Commit

Permalink
Update branch in CONTRIBUTING instructions
Browse files Browse the repository at this point in the history
  • Loading branch information
derickr committed Jan 28, 2025
1 parent 115bac0 commit cff20f9
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ Initial Set-up
git remote add upstream https://github.com/xdebug/xdebug.git
git fetch upstream

- Add a tracking branch for Xdebug 3.3::
- Add a tracking branch for Xdebug 3.4::

git checkout --track origin/xdebug_3_3
git checkout --track origin/xdebug_3_4

Branches
--------
Expand All @@ -40,18 +40,18 @@ There are two branches in operation:

``master``
This is were all new feature Pull Requests should be targeted at
``xdebug_3_3``
``xdebug_3_4``
This is were all bug fix Pull Requests should be targeted at. The
maintainer will add them to ``master`` too when merging the Pull Request.

Working on a Pull Request
-------------------------

- Make sure that your ``master`` and ``xdebug_3_3`` branches are up to date
- Make sure that your ``master`` and ``xdebug_3_4`` branches are up to date
with the ``upstream`` repository.
- Create an issue in the `issue tracker <https://bugs.xdebug.org>`_ (if none
exists yet).
- Switch to the right target branch (``master`` for features, ``xdebug_3_3``
- Switch to the right target branch (``master`` for features, ``xdebug_3_4``
for bug fixes).
- Create a feature branch::

Expand Down Expand Up @@ -89,7 +89,7 @@ Working on a Pull Request
will be targeting, for example to rebase against the current bug fix
branch::
git fetch upstream && git rebase upstream/xdebug_3_3
git fetch upstream && git rebase upstream/xdebug_3_4
- Push your changes to your remote repository::
Expand Down

0 comments on commit cff20f9

Please sign in to comment.