Git: Merge conflicts on Mac

Branches? Merges? It can be complex.

The use of Git is essential when creating software. As you use it you’ll realise how much of a flexible system it!

Photo by Yancy Min on Unsplash
  • Some previous use of VIM would be advantageous to create, edit and merge files.