On Wed, Mar 2, 2016 at 1:31 PM, Richard Hipp <d...@sqlite.org> wrote: > On 3/2/16, Luca Ferrari <fluca1...@infinito.it> 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 match the > https://www.fossil-scm.org/fossil/artifact/b2502f631c761f2c?ln=143-146 > merge marker patterns. This suggests that you did not fully resolve > the merge conflict.
Uhm...I double checked and ran my tests, and check the php syntax, no errors and no "merge" related sections. My fossil version is 1.33 [bd97cb7306]. ANy other idea? Luca _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
