X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=doc%2FGithub.md;h=5fbc3788ee9695ac245f0978f5bbac31cb26748a;hb=63a628460e70946a48ed5ba0ac65842d5aefb474;hp=92bcfe1667f0e5aac7a1b2c4765aec09c0d6585a;hpb=4d8d5ca6a58af9aa98cd7f6ca38da5176c621f0d;p=friendica.git diff --git a/doc/Github.md b/doc/Github.md index 92bcfe1667..5fbc3788ee 100644 --- a/doc/Github.md +++ b/doc/Github.md @@ -22,7 +22,7 @@ Our Git Branches There are two relevant branches in the main repo on GitHub: -1. master: This branch contains stable releases only. +1. stable: This branch contains stable releases only. 2. develop: This branch contains the latest code. This is what you want to work with. @@ -43,7 +43,7 @@ Release branches A release branch is created when the develop branch contains all features it should have. A release branch is used for a few things. -1. It allows last-minute bug fixing before the release goes to master branch. +1. It allows last-minute bug fixing before the release goes to stable branch. 2. It allows meta-data changes (README, CHANGELOG, etc.) for version bumps and documentation changes. 3. It makes sure the develop branch can receive new features that are **not** part of this release. @@ -70,7 +70,7 @@ Don't hesitate to ask us in case of doubt. 3. Check your code for typos. There is a console command called *typo* for this. - $> php bin/console typo + $> php bin/console.php typo Check out how to work with [our Vagrant](help/Vagrant) to save a lot of setup time!