From 523b80e4976546cdb72ac6df17352ff820d29154 Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Thu, 28 Mar 2024 09:06:43 +0000 Subject: [PATCH] We're in Xdebug 3.3 already, update contributing guidelines --- CONTRIBUTING.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 2780bc70c..54a9c0cef 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -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.1:: +- Add a tracking branch for Xdebug 3.3:: - git checkout --track origin/xdebug_3_1 + git checkout --track origin/xdebug_3_3 Branches -------- @@ -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_1`` +``xdebug_3_3`` 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_1`` branches are up to date +- Make sure that your ``master`` and ``xdebug_3_3`` branches are up to date with the ``upstream`` repository. - Create an issue in the `issue tracker `_ (if none exists yet). -- Switch to the right target branch (``master`` for features, ``xdebug_3_1`` +- Switch to the right target branch (``master`` for features, ``xdebug_3_3`` for bug fixes). - Create a feature branch:: @@ -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_1 + git fetch upstream && git rebase upstream/xdebug_3_3 - Push your changes to your remote repository::