Reapply a commit that was undone by conflict?

git github tortoisegit
Will picture Will · Jul 24, 2011 · Viewed 22.8k times · Source

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.

Answer

svick picture svick · Jul 24, 2011

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> ...

Related questions

Git error: "Please make sure you have the correct access rights and the repository exists"

I am using TortoiseGit on Windows. When I am trying to Clone from the context menu of the standard Windows Explorer, I get this error: Please make sure you have the correct access rights and the repository exists More precisely, …

Read More
TortoiseGit save user authentication / credentials

Is there a way to save GITHUB's user credentials with TortoiseGit? It prompts me the below dialog every time whenever I do a push/pull. I would like to save my user credential information somewhere like how I did with …

Read More
TortoiseGit trouble: git did not exit cleanly (exit code 128)

Here is a little bit background: I run Win7 I have private git repo and installed Github for Windows I didn't like the Github for Windows client (lack capabilities). I installed TortoiseGit for Windows (still keep Github for Windows) I …

Read More