See code before either change (before change in both branches that now conflicts)
git diff --merge
In Git there are many ways to revert/restore the codebase, chunk by chunk (verify), file by file, en masse, and so on.
One way is simply to make the best of the checkout command! To illustrate, suppose you are working on a Rails project, and you are on branch development
where you have put one of your existing serializers through a series of modifications. The
word comes down that messing with the given serializer is causing problems for the other devs. You find a better way to