1.
When adding a new feature or fixing a bug (well, why fix it, was that not a feature?), ALWAYS check out a new feature branch from the master.
NEVER checkout a feature branch from next (see below). The feature branch should be named user/feature_name.
3.
The next branch is intended for testing and confirm confirming things do not break. So, after feature branches are merged into next and conflicts resolved, if things work we push it to merge into master. You After this, you can end the feature branches if you want.
==Quick and dirty github tutorial==