1

I've seen this hundreds if not thousands of times, but what does it actually mean?

Are there other strategies that I can use, perhaps variants on mine or their?

What is the syntax for using different strategies and in what situations should I choose one over an other?

Michael Durrant
  • 93,410
  • 97
  • 333
  • 497
  • I've seen `octopus` a couple of times. – SLaks Jan 29 '14 at 15:45
  • 1
    Are some of these questions addressed by the [git-merge(1)](http://git-scm.com/docs/git-merge) man page? – Magnus Bäck Jan 29 '14 at 15:50
  • That has good and useful info but not really the same main question, I'm not primarily asking when I would use the different styles, my main question is what recursive means itself when I see it. nit-pick perhaps but I think my question would be of use to others as is. – Michael Durrant Jan 30 '14 at 02:25

0 Answers0