Re: surprising behavior from merge

From: Sebastian Kuzminsky <seb@highlab.com>
Date: May 12, 2012, 00:05 UTC
Message-ID: <4FADA967.10808@highlab.com>
In-Reply-To: <ae419d8bbc2b44bfa4c0a7eb421f5037-mfwitten@gmail.com>

On 05/11/2012 05:57 PM, Michael Witten wrote:

> On Fri, 11 May 2012 16:25:29 -0600, Sebastian Kuzminsky wrote:
>
>> The simplified repo is here if anyone wants to inspect it:
>> https://github.com/SebKuzminsky/merge-problem

...

Show 6 quoted lines

> In other words, rather than burdening people with the task of
> constructing a mental picture of what you have done, you should
> show them as directly and precisely as possible; in this way,
> people can go about the business of discussing your issue much
> more quickly and, most importantly, PRECISELY.
>

Ah, I had intended the extremely tiny git repo I linked to to provide the info in the most concise way possible. The surprising behaviour happened at the final commit in the repo, which was made by 'git merge other'.

I can email a list of commands to reproduce the issue later tonight if that would make anything clearer.

-- 
Sebastian Kuzminsky