[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Monotone-devel] How to join identical branches?

From: Derek Scherger
Subject: Re: [Monotone-devel] How to join identical branches?
Date: Sun, 17 Feb 2008 08:39:57 -0700
User-agent: Thunderbird (X11/20071116)

Derek Scherger wrote:
There is currently a section "Advanced Uses | Workspace Collisions"; we
could add "Advanced Uses | Non-content Conflicts". I can do that, once
I get confirmation that I understand the issues correctly.

I've been meaning to add such a section on Non Content Conflicts since I made the changes to improve the associated messages. Ideally this would be worded in terms of the new messages. I'd still like to get this done, but I don't know when I'll get to it so I won't feel bad if you beat me to it. ;)

Just so you don't go duplicating work, I managed to write this section last night. I'll push it to as soon as it comes back to life. If you have a chance, a review of what I've written would be great.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]