The journey with vendor branch in git

Fri Dec 19 07:19:28 PST 2008

YONETANI Tomokazu wrote:
On Fri, Dec 19, 2008 at 10:13:08PM +0900, YONETANI Tomokazu wrote:
$ git merge --no-commit OPENPAM
$ git merge --no-commit OPENPAM^ OPENPAM

Well, I think both should give you the same result; the same changes
and the same merge parents.
Actually this was wrong; with octopus, three records are recorded
as merge parents (HEAD... OPENPAM^... OPENPAM...), on the other hand
only two (HEAD... OPENPAM...) by the default merge method.  I don't
know how it affects later merges, though.
Please just use

	git merge -s resolve crater/vendor/OPENPAM

That did the trick for me.  Doesn't buildworld though, so I won't push it :)

cheers
  simon
--
  <3 the future  +++  RENT this banner advert  +++   ASCII Ribbon   /"\
  rock the past  +++  space for low â‚¬â‚¬â‚¬ NOW!1  +++     Campaign     \ /
Party Enjoy Relax   |   http://dragonflybsd.org      Against  HTML   \
Dude 2c 2 the max   !   http://golden-apple.biz       Mail + News   / \