sync two branches in git