170
edits
Changes
Jump to navigation
Jump to search
no edit summary
To access this from your computer and not the RDP you can go to http://128.42.44.182/codebase where it will prompt you for your username and password.
==Our Git workflow==
We chose a simple git workflow.
Our aim is not to break things in the master branch. All commits on the master should work.
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.
2.
After feature development is complete merge your feature-branch into next.
3.
The next branch is intended for testing and confirm things do not break. So, after feature branches are merged into next and conflicts resolved, if things work we push it to master.
You can end the feature branches if you want.
==Quick and dirty github tutorial==
