|
From: | Stephen Leake |
Subject: | Re: [Monotone-devel] Re: OpenEmbedded looking to jump ship |
Date: | Sun, 04 May 2008 11:59:36 -0400 |
User-agent: | Gnus/5.1008 (Gnus v5.10.8) Emacs/22.1 (windows-nt) |
Stephen Leake <address@hidden> writes: >>> >> I proposed a new process for resolving non-content conflicts; see >>> >> >>> >> http://lists.gnu.org/archive/html/monotone-devel/2008-04/msg00084.html >>> >> >>> >> Would that help? >>> > >>> > It looks like that would help >>> >>> good. I've merged automate_show_conflicts into main; it provides just the 'automate show_conflicts' command. So people can start playing with it. I'll work on adding the required functionality in merge on the branch next. -- -- Stephe
[Prev in Thread] | Current Thread | [Next in Thread] |