branches.txt

So my workflow would be:
1   Make a change
1b  Make a branch?
1c  Commit change to branch
1d  Push branch to origin (do I need to do something beyond `git push`?)
2   Pull down the package in a dev VM
3   If bad GOTO 1
4   If good merge into master `git checkout master; `
4b  Fix the rel version
4c  Create a new commit
4d  Tag commit with version (likely have a script for this) `git tag v...`
4e  Push to origin `git push --tags`
4f  Remove package from testing repo


Additional questions:
Is there a way to merge the testing branch into master and have it appear as a single commit?


Additional notes:
<jerith> My workflow is as follows:
<jerith> 1. git checkout -b branch-name
<jerith> 2. make a bunch of changes, push one or more commits
<jerith> 3. open a pull request from the branch to master
<jerith> 3a. check that builds/tests are all green
<jerith> 3b. have a colleague review the PR and approve the changes
<jerith> 4. git checkout master; git merge --no-ff branch-name (we want a merge commit even if fast-forward is possible)
<jerith> 5. (when we decide it's time for a release) git tag v1.2.3; git push --tags