git tips 1

some tips for merge and tags