Menu
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.
269
Sometimes work can get lost when there are mishaps using Git. Changes can be reversed by accident by reverts of merge commits for example. The quickest way to fix such issues of lost changes is to use git cherry-pick which allows you to apply the changes introduced by existing commits.
Go back to the selected commit on your local environmentUse git checkout & the ID (in the same way you would checkout a branch) to go back: $ git checkout <commit-id> . Don't forget the final ' .
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> ... If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
