initial git scenarios and solutions