Add a file that still needs to be tested.
Using some stuff
Oops, fix something in the branch
Merge branch 'master' into a-new-branch-off-of-f1e2f64
Explain what we see after merging master to the new branch
Merge branch 'branch-in-testing-from-which-we-need-stuff'
Explain git merge branch-in-testing-from-which-we-need-stuff
Merge a-new-branch-off-of-f1e2f64 with conflict resolution
Summarize results of branching off a branch