Re: git merge a b when a == b but neither == o is always a successful merge?

2014-11-24 Thread Daniel Hagerty
I agree that the approach taken here is a sensible way to implement the design, _if_ the design and the problem it tries to solve makes sense. I am not sure about that yet myself, though. This is a first things first. What aspect of the problem to be solved is in question?

git merge a b when a == b but neither == o is always a successful merge?

2014-11-17 Thread Daniel Hagerty
Given a repository setup thusly: $ git --version git version 2.2.0.rc2 git init . echo '0.0' version git add version git commit -m master for i in a b ; do git checkout -b $i master echo '0.1' version git commit -a -m leg $i done git checkout -b c master echo '0.2' version git

Re: git merge a b when a == b but neither == o is always a successful merge?

2014-11-17 Thread Daniel Hagerty
scoped, does it make sense to expose it anywhere else? Is it accurate to speak of this as exposing merge minimal? Thanks! commit 3a8bc89950576c0445167e4f5ee5f42d9d737d2d Author: Daniel Hagerty h...@linnaean.org Date: Mon Nov 17 15:42:04 2014 -0500 merge: expose XDL_MERGE_MINIMAL