[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] How to join identical branches?
|
From: |
Nuno Lucas |
|
Subject: |
Re: [Monotone-devel] How to join identical branches? |
|
Date: |
Tue, 12 Feb 2008 12:38:18 +0000 |
On Feb 12, 2008 7:32 AM, Stephen Leake <address@hidden> wrote:
> In similar situations, the only way I have discovered is to drop the
> conflicting file from the target of the propagate. Then the propagate
> will restore it.
Thanks, that worked.
Regards,
~Nuno Lucas
- [Monotone-devel] How to join identical branches?, Nuno Lucas, 2008/02/11
- Re: [Monotone-devel] How to join identical branches?, Julio M. Merino Vidal, 2008/02/11
- Re: [Monotone-devel] How to join identical branches?, Stephen Leake, 2008/02/12
- [Monotone-devel] Re: How to join identical branches?, Koen Kooi, 2008/02/12
- Re: [Monotone-devel] How to join identical branches?,
Nuno Lucas <=
- Re: [Monotone-devel] How to join identical branches?, Markus Schiltknecht, 2008/02/12
- Re: [Monotone-devel] How to join identical branches?, Stephen Leake, 2008/02/13
- Re: [Monotone-devel] How to join identical branches?, Markus Schiltknecht, 2008/02/13
- Re: [Monotone-devel] How to join identical branches?, Stephen Leake, 2008/02/13
- Re: [Monotone-devel] How to join identical branches?, Markus Schiltknecht, 2008/02/13
- Re: [Monotone-devel] How to join identical branches?, Stephen Leake, 2008/02/14
- Re: [Monotone-devel] How to join identical branches?, Markus Schiltknecht, 2008/02/14
- [Monotone-devel] improving show_conflicts, Stephen Leake, 2008/02/19
- Re: [Monotone-devel] improving show_conflicts, Derek Scherger, 2008/02/20
- Re: [Monotone-devel] improving show_conflicts, Stephen Leake, 2008/02/20