applications/i3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1837 from obfusk/fix-branch-info

Browse Source 
hacking-howto: re-word branches info
This commit is contained in:
Michael Stapelberg 2015-08-10 19:18:43 +02:00
commit 45e2375ccc
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docs/hacking-howto
View File

@ -982,14 +982,16 @@ could have a look at previous reviews and see what the common mistakes are.
=== Which branch to use? === Which branch to use?
Work on i3 generally happens in two branches: “master” and “next”. Since Work on i3 generally happens in two branches: “master” and “next” (the latter
“master” is what people get when they check out the git repository, its being the default branch, the one that people get when they check out the git
contents are always stable. That is, it contains the source code of the latest repository).
release, plus any bugfixes that were applied since that release.
The contents of “master” are always stable. That is, it contains the source code
of the latest release, plus any bugfixes that were applied since that release.
New features are only found in the “next” branch. Therefore, if you are working New features are only found in the “next” branch. Therefore, if you are working
on a new feature, use the “next” branch. If you are working on a bugfix, use on a new feature, use the “next” branch. If you are working on a bugfix, use the
the “next” branch, too, but make sure your code also works on “master”. “next” branch, too, but make sure your code also works on “master”.
== Thought experiments == Thought experiments