How To Merge Dev Into My Branch Git