What I am taking away from this discussion is that to ask the author to
make sure the branch merges. That is actually useful to know.
> To be more precise, the commit causing the conflict is
>
>
Hmm, it already didn't merge before that, though...
--
You received this message because you a
To be more precise, the commit causing the conflict is
commit 40d4cfaa662913ca6795a8a9a598b53cf931809c
Author: drvinceknight
Date: Tue Sep 2 08:49:08 2014 +0100
Deleting files from other tickets
This deletes files which were changed by other tickets.
--
You received this message because
On 2014-09-03 15:19, kcrisman wrote:
Not sure whether this or sage-support is more appropriate...
On e.g. http://trac.sagemath.org/ticket/16331 (well, and elsewhere)
there is a branch listed that for some reason doesn't merge cleanly.
Unfortunately, that means I can find no way to look at the di
Not sure whether this or sage-support is more appropriate...
On e.g. http://trac.sagemath.org/ticket/16331 (well, and elsewhere) there
is a branch listed that for some reason doesn't merge cleanly.
Unfortunately, that means I can find no way to look at the diff visually
all at once for this b
