Several times when making merge with fossil, I ended up with really strange
conflicts like this:
BEGIN MERGE CONFLICT: original content first
include '%TargetOS%/mouse.asm'=== original content above; conflict below
=
include '%TargetOS%/mouse.asm' END MERGE CONFLICT: conflict
On Fri, Mar 04, 2011 at 06:18:11PM +0200, John Found wrote:
Several times when making merge with fossil, I ended up with really strange
conflicts like this:
BEGIN MERGE CONFLICT: original content first
include '%TargetOS%/mouse.asm'=== original content above; conflict below
On Fri, Mar 4, 2011 at 11:18 AM, John Found johnfo...@evrocom.net wrote:
Several times when making merge with fossil, I ended up with really strange
conflicts like this:
BEGIN MERGE CONFLICT: original content first
include '%TargetOS%/mouse.asm'=== original content above; conflict
@lists.fossil-scm.org)
From: Lluís Batlle i Rossell (virik...@gmail.com)
Subject: Re: [fossil-users] Strange merge conflicts.
Date: 4.3.2011 18:19:25
On Fri, Mar 04, 2011 at 06:18:11PM +0200, John Found wrote:
Several times when making merge with fossil, I ended up with really
strange conflicts like
@lists.fossil-scm.org)
From: Lluís Batlle i Rossell (virik...@gmail.com)
Subject: Re: [fossil-users] Strange merge conflicts.
Date: 4.3.2011 18:19:25
On Fri, Mar 04, 2011 at 06:18:11PM +0200, John Found wrote:
Several times when making merge with fossil, I ended up with really
strange conflicts like
...@sqlite.org)
Subject: Re: [fossil-users] Strange merge conflicts.
Date: 4.3.2011 18:23:12
On Fri, Mar 4, 2011 at 11:18 AM, John Found johnfo...@evrocom.net wrote:
Several times when making merge with fossil, I ended up with really
strange conflicts like this:
BEGIN MERGE CONFLICT: original
I'd go further, and say that the same change happening separately in
two branches is a conflict. Given initial content
a
b
For feature foo Bob changes it to
a
c
b
for feature bar Tom changes it to
a
c
b
When you want a branch with both features foo and bar, there isn't a
reasonable way for
-- Original Message --
Opinions on this vary. Fossil used to ignore whitespace at the ends of
lines when merging. But I changed this just the other day in response to
a complaint:
http://www.fossil-scm.org/fossil/ci/1d93222627
So, Fossil treats CR($0d) and LF($0a) as a
I do not agree here. Of course, the solution is:
a
c
b
It follows the principle of least surprise. If you want to make very
strange things with merges, do not use a tool with automatic merge. Do
it manually.
Also, the merge of two equal lines, one with unix line end and the
other with Windows
: [fossil-users] Strange merge conflicts.
Date: 4.3.2011 18:23:12
On Fri, Mar 4, 2011 at 11:18 AM, John Found johnfo...@evrocom.net wrote:
Several times when making merge with fossil, I ended up with really
strange conflicts like this:
BEGIN MERGE CONFLICT: original content first
include
10 matches
Mail list logo
