git cherry pick merge strategy