[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] resolving name conflicts; file suturing vs drop
From: |
Ludovic Brenta |
Subject: |
Re: [Monotone-devel] resolving name conflicts; file suturing vs drop |
Date: |
Mon, 5 May 2008 14:30:33 +0200 |
User-agent: |
Internet Messaging Program (IMP) 3.2.2 |
Selon Ludovic Brenta <address@hidden>:
> For content merges, emacs allows to use "default-A" or "default-B". If the
> same was available for non-content conflicts I would be happy.
To follow up on that, I think this would involve two steps: (1) suturing the two
like-named files into one, (2) resolving the ensuing content conflict as usual.
In my case, the two files have the same content, but that may not be true in
the general case (i.e. if there are some intervening revisions on either
branch). For this resolution, I would almost always use emacs' "default-A" to
choose the file contents from development branch when resolving the conflict.
--
Ludovic Brenta.
- [Monotone-devel] resolving name conflicts; file suturing vs drop, Stephen Leake, 2008/05/04
- Re: [Monotone-devel] resolving name conflicts; file suturing vs drop, Markus Schiltknecht, 2008/05/05
- Re: [Monotone-devel] resolving name conflicts; file suturing vs drop, Ludovic Brenta, 2008/05/05
- Re: [Monotone-devel] resolving name conflicts; file suturing vs drop, Thomas Moschny, 2008/05/05
- Re: [Monotone-devel] resolving name conflicts; file suturing vs drop, Markus Schiltknecht, 2008/05/05
- Re: [Monotone-devel] resolving name conflicts; file suturing vs drop, Stephen Leake, 2008/05/05
- Re: [Monotone-devel] resolving name conflicts; file suturing vs drop, Ludovic Brenta, 2008/05/05
- Re: [Monotone-devel] resolving name conflicts; file suturing vs drop,
Ludovic Brenta <=
- Re: [Monotone-devel] resolving name conflicts; file suturing vs drop, Stephen Leake, 2008/05/05
- Re: [Monotone-devel] resolving name conflicts; file suturing vs drop, Stephen Leake, 2008/05/05
- Re: [Monotone-devel] resolving name conflicts; file suturing vs drop, William Uther, 2008/05/05
- Re: [Monotone-devel] resolving name conflicts; file suturing vs drop, Stephen Leake, 2008/05/05
- Re: [Monotone-devel] resolving name conflicts; file suturing vs drop, William Uther, 2008/05/05
- Re: [Monotone-devel] resolving name conflicts; file suturing vs drop, Markus Schiltknecht, 2008/05/06