commit on testing branch
commit for switching to master branch
commit before merge back
clean staged area for merge
Merge branch 'gitnotes'

Conflicts:
	scm/git_branching
commit again after 'gitnotes' has been merged
Merge branch 'gitnotes'

Conflicts:
	scm/git_branching