On Tue, Sep 30, 2008 at 11:07 PM, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote:
>
> Hi,
>
> I just tried the merge on sage math, but it still is having problems.
> Below is the output with a fresh build and clone of the main
> repository. Thanks,
>
> -Jon
> =)
>
>
Hi,
I just tried the merge on sage math, but it still is having problems.
Below is the output with a fresh build and clone of the main
repository. Thanks,
-Jon
=)
--
sage [s
On Tue, Sep 30, 2008 at 3:21 PM, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote:
> Hi William,
>
> No diff program appears, thought I know what you mean. I'm running
> SAGE 3.1.2 on OS 10.5.5, which I compiled from source. What is the
> standard program that should be called? Diff is installed on
On Tue, Sep 30, 2008 at 9:11 AM, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote:
>
> Great That's much simpler. =) This clears up the patch forcing, but
> I still get merge conflict errors when I run 'hg merge'. Is there a
> nice way resolving these conflicts? Thanks,
You just have to resolve th
Great That's much simpler. =) This clears up the patch forcing, but
I still get merge conflict errors when I run 'hg merge'. Is there a
nice way resolving these conflicts? Thanks,
-Jon
=)
On Sep 30, 11:58 am, "William Stein" <[EMAIL PROTECTED]> wrote:
> On Tue, Sep 30, 2008 at 8:52 AM, Jo
On Tue, Sep 30, 2008 at 8:52 AM, Jonathan Hanke <[EMAIL PROTECTED]> wrote:
> Hi,
>
> I have a question about how to merge patches when they misbehave. I have
> some development code in a sage 2.8.14 branch which I want to merge to the
> newest version of sage on another machine (both Macs). To d
