Re: [fossil-users] merge conflict: a doubt

2016-03-03 Thread Stephan Beal
On Thu, Mar 3, 2016 at 12:38 PM, Luca Ferrari wrote: > Could it be repo.cksum off? > No - that one controls whether or not the so-called "R-card" is generated and/or validated (the R-card is another level of integrity checking, but is expensive to calculate, so it is

Re: [fossil-users] merge conflict: a doubt

2016-03-03 Thread Luca Ferrari
On Thu, Mar 3, 2016 at 12:11 PM, Stephan Beal wrote: > Please update if at all possible. 1.33 is almost a year old, and the past 12 > months have seen lots of activity: Yes, I'm updating. > My currently hypotheses is that you perhaps had an editor session active, > but

Re: [fossil-users] merge conflict: a doubt

2016-03-03 Thread Stephan Beal
On Thu, Mar 3, 2016 at 8:17 AM, Luca Ferrari wrote: > My fossil version is 1.33 [bd97cb7306]. > ANy other idea? > Please update if at all possible. 1.33 is almost a year old, and the past 12 months have seen lots of activity:

Re: [fossil-users] merge conflict: a doubt

2016-03-02 Thread Luca Ferrari
On Wed, Mar 2, 2016 at 1:31 PM, Richard Hipp wrote: > On 3/2/16, Luca Ferrari wrote: >> >> % fossil commit >> possible unresolved merge conflict in ./classes/PraticaBase.php >> abort due to unresolved merge conflicts; use --allow-conflict to override >> >

Re: [fossil-users] merge conflict: a doubt

2016-03-02 Thread Richard Hipp
On 3/2/16, Luca Ferrari wrote: > > % fossil commit > possible unresolved merge conflict in ./classes/PraticaBase.php > abort due to unresolved merge conflicts; use --allow-conflict to override > That means your input file "PraticaBase.php" contains one or more lines that

[fossil-users] merge conflict: a doubt

2016-03-02 Thread Luca Ferrari
Hi all, today I merged from trunk into a branch of my project and got a conflict on a file: % fossil status .. CONFLICT classes/PraticaBase.php EDITED classes/ProtocolloInfoStruct.php MERGED_WITH cdbb6ceba8fdb2b51410b76af7ce5b86b691e8a9 So I edited the conflicting file and resolved