Code Management & Version Control

Use "a" key to toggle between single page and slideshow modes. Use the space bar or right arrow for next slide,
left arrow to back up.

Configuration Management

Approximate synonyms:
- Revision control
- Version control
- Source control
- Source code management
Related concepts:
- Work flow
- Work queues, task tracking
- Content management

Choose a feature/task/story to work on, and mark it as being worked on (presumes a workflow tool is being used)
Git a fresh copy of the baseline code tree
```
git checkout master
git pull
```
Make a branch to work in
```
git checkout -b storybranch
```
Write a test for the feature/story

Make changes to the code, commiting often

git commit -am "summary of what changes I made just now"

When the test passes, do another commit, and cycle back to step 4, until the feature/story is believed to be complete
Merge with master
1. Review changes
```
git diff master
```
2. Merge changes
```
git checkout master
git pull
git checkout storybranch
git rebase master
```
Correct any conflicts, and repeat until convergence
Push new version back to the trunk
```
git checkout master
git merge storybranch
git push
git checkout storybranch
```
This presumes there are no merge conflicts.

Notes:

Some teams add a moderator, to check that changes to the master branch are OK, before everybody else sees them.
Using the git rebase -i ... permits "squashing" multiple intermediate revisions, to make history more readable.