Git branches and team work
There are two branches: master and rebuild.
The 'master' is the old version of SenseMap. It is available from the Chrome app shop. We are not working on it anymore, as we decided to rebuild it.
The 'rebuild' is the branch everyone is working on. It currently has a minimal set of functions to make the test and architectural change a bit easier.
Ideally, everyone should have his/her own branch off 'rebuild', such as the 'Shahzaib' (called 'rebuild-shaz' in the repository) and 'Ameesha' in the figure below, and then merge back to the 'rebuild' when the changes are completed.
The detailed workflow (as recommended by github). The github help page has links to how to do each of these steps.
- Create a branch from the repository.
- Create, edit, rename, move, or delete files.
- Send a pull request from your branch with your proposed changes to kick off a discussion.
- Make changes on your branch as needed. Your pull request will update automatically.
- Merge the pull request once the branch is ready to be merged.
- Tidy up your branches using the delete button in the pull request or on the branches page.