gitclassv4 a simulation of the main branch being updated by a teammate while I'm working on the new-feature branch