git notes on how to pull, merge