Table Of Content for post

Skip to the relevant sections if needed.

• Concepts for resolving Git conflicts
• Setting up different editors / tool for using git mergetool
  • Finding out what mergetool editors are supported
• mergetool simple code example for vimdiff
• Other great references and tutorials

Concepts for resolving Git conflicts

For ...

more ...