git cherry pick merge commit intellij