What about the Java practice of having a matching implementation class for every class? Or does that actually serve a purpose, lol.

Thanks. I wonder what effect that has on the git history of branch 2?

For some reason I thought cherry picking might be the ability to take any file from any commit on any branch and copying it to the current branch.

Nice, would you explain cherry picking to me, a dummy?