On Sat, Nov 14, 2015 at 2:38 PM, wrote:
> Thanks for the detailed explanation. It makes perfect sense now.
> Certainly, a rather difficult task to get right algorithmically.
>
I know. It is amazing to me that three way merge works as often as it does.
:)
>
> Many thanks also to all previous
Thanks for the detailed explanation. It makes perfect sense now. Certainly,
a rather difficult task to get right algorithmically.
Many thanks also to all previous respondents.
From: Scott Robison
Sent: Saturday, November 14, 2015 8:22 PM
To: Fossil SCM user's discussion
Subject: Re: [fossil-u
On Fri, Nov 13, 2015 at 6:14 PM, wrote:
> The following Windows batch file will reproduce the condition I’m talking
> about (f = fossil):
>
> f new sample.fossil
> f o sample.fossil
> echo Hello > hello.txt
> f add hello.txt
> f com -m Initial
> echo Hello, World > hello.
But did you have to spoil our innocence? :)
From: Stephan Beal
Sent: Saturday, November 14, 2015 11:11 AM
To: Fossil SCM user's discussion
Subject: Re: [fossil-users] Unexpected merge conflict
On Sat, Nov 14, 2015 at 2:14 AM, wrote:
f up ...
f me ...
while i also use 'f' as a local fos
On Sat, Nov 14, 2015 at 2:14 AM, wrote:
> f up ...
> f me ...
>
while i also use 'f' as a local fossil alias, it never, until now, occurred
to me how inappropriate it sounds in conjunction with specific commands! ;)
--
- stephan beal
http://wanderinghorse.net/home/stephan/
http://gplus.to/
5 matches
Mail list logo
