git hints after a day of branches and merging