|
|
@@ -25,7 +25,17 @@ All project files should follow [CONVENTIONS.md](CONVENTIONS.md) please,
|
|
|
read them carefully.
|
|
|
|
|
|
### Git workflow
|
|
|
-[...]
|
|
|
+There are two important branches: `master` and `develop`.
|
|
|
+
|
|
|
+`Master` is read-only for everyone except owner and `develop` is avaiable
|
|
|
+only for pull requests.
|
|
|
+
|
|
|
+When you want to make a new feature, you make a new branch from `develop`
|
|
|
+with name like `feat/my-branch-name`. After you've done, you make a pull
|
|
|
+request (or ask me to do it) back to `develop`.
|
|
|
+
|
|
|
+Same with fixes (`fix/my-branch-name`).
|
|
|
+
|
|
|
|
|
|
### Development
|
|
|
Development is going primary on [git.parthen.site](https://git.parthen.site).
|
