git merge

If this course was an episode of MTV Cribs, this would be the moment where I said “this is where the magic happens”. Git merge can be used to merge two versions of your files. It is mainly used to merge two branches together, say a feature branch into the master branch. If you use GitHub or Bitbucket, they will mostly be in charge of merging your files, which is why I almost never run git merge myself.