If you have a previous commit that you would like to reapply - if it’s been overwritten by following commit - you can use git cherry-pick. To start, find the commit hash for the commit/s you want to reapply. Next you need to be be up-to-date with HEAD or the branch you want to apply the commit to.
git pull git cherry-pick db7a37742c
Unless you’re lucky you’ll get a conflict. The error message isn’t terribly helpful:
error: could not apply d346377... %COMMIT MESSAGE% hint: after resolving the conflicts, mark the corrected paths hint: with 'git add <paths>' or 'git rm <paths>' hint: and commit the result with 'git commit'
To get more detail try
You’ll see your branch (double check this), changes to be committed and unmerged paths. The unmerged paths will be the files that are in conflict. Open the file with
to see the diff, make your changes and then git add %FILENAME%. When you’re done you can commit normally:
To abort at any time
git cherry-pick --abort