Git

Explain Git octopus merge

Difficulty: unrated

Source: bregman-arie/devops-exercises by Arie Bregman

Answer

Probably good to mention that it's:

  • It's good for cases of merging more than one branch (and also the default of such use cases)
  • It's primarily meant for bundling topic branches together

This is a great article about Octopus merge: http://www.freblogg.com/2016/12/git-octopus-merge.html