Reapply a commit that was undone by conflict?

I have this commit that was undone by someone who doesn't know how to deal with conflicts. Is there an easy way to try auto merging the commit back in? I开发者_高级运维 tried using "merge to master" but it just says up to date. I am using tortoisegit.

That's what git cherry-pick is for. It lets you apply changes by using already existing commits.

The basic syntax is:

git cherry-pick <commit> ...