Running I don't understand why this answer received so many upvotes, it isn't really very helpful as it only contains this one command and absolutely no explanation how to use it.
As others said, it opened a vimdiff and even if I know how to use vim (switch the windows at least or close them) I don't even know what each window represent neither how to compare or accept the changes.
It is much better than doing the whole thing by hand certainly.
As per @Josh Glover comment: The command doesn't necessarily open a GUI unless you install one.
When you're rebasing, then "ours" means the commits you're rebasing onto, while "theirs" refers to the commits that you want to rebase.
I find merge tools rarely help me understand the conflict or the resolution.
(Knowing how to fix a conflict is very different; you need to be aware of what other people are working on.
If you're confused, it's probably best to just call that person into your room so they can see what you're looking at.) If the conflict is longer, then I will cut and paste each of the three sections into three separate files, such as "mine", "common" and "theirs".
It graphically can show the changes between 3 files and it allows automatic merging (when safe to do so) and full control over editing the resulting file. For conflicts that involve more than a few lines, it's easier to see what's going on in an external GUI tool.
Then it's easy to see that the content you've updated isn't in the repository and needs to be added.
This way of thinking also explains why Git doesn't track empty folders: Although they are technically files, there isn't any content to track.content is there, conflict occurs because there 2 version of content. And it does not work (git add, git commit) if you want commit only that one file after conflict was resolved ("fatal: cannot do a partial commit during a merge.")Yes, technically, this answers the question which as asked, but is not a usable answer, in my opinion, sorry.
I'm usually more successful looking at the conflict markers in a text editor and using git log as a supplement.
Here are a few tips: The best thing I have found is to use the "diff3" merge conflict style: The middle section is what the common ancestor looked like.