On Fri, 27 May 2011 09:51:37 -1000, Eric Firing wrote:
[clip]
> Nice--but what exactly is the meaning of "left" and "right"?
When you write
git checkout this-branch
git merge other-branch
the left parent of the new merge commit is `this-branch` and
the right one is `other-branch`
On 05/27/2011 08:31 AM, Pauli Virtanen wrote:
> On Fri, 27 May 2011 07:29:15 -1000, Eric Firing wrote:
> [clip]
>> I wouldn't worry about it. It seems likely that other things from
>> master did leak into v1.0.x, but at this point I don't think it matters.
>> v1.0.x and master both build and run (
On Fri, 27 May 2011 07:29:15 -1000, Eric Firing wrote:
[clip]
> I wouldn't worry about it. It seems likely that other things from
> master did leak into v1.0.x, but at this point I don't think it matters.
> v1.0.x and master both build and run (or did last time I checked).
> The division between t
On 05/27/2011 05:02 AM, Michael Droettboom wrote:
> On 05/26/2011 03:19 PM, Eric Firing wrote:
>>
>> Mike,
>>
>> I think you did--unintentionally! If you look at the graph with qgit
>> (or presumably any other such tool) in the vicinity of your commits on
>> May 6, you will see that this one
>>
>>
On 05/26/2011 03:19 PM, Eric Firing wrote:
>
> Mike,
>
> I think you did--unintentionally! If you look at the graph with qgit
> (or presumably any other such tool) in the vicinity of your commits on
> May 6, you will see that this one
>
> a50874b711983cba505ecdb2801c4996eccf3812
>
> made v1.0.x br
