On 3/16/17, Richard Bukovansky <richard.bukovan...@gmail.com> wrote: > HI, > I’m new to Fossil, but I would like to ask you, how Fossil handles > conflicting edits to tickets? > In my company we are currently looking for distributed scm&ticketing system, > but about this we are not sure.
Every edit has a timestamp. The edits are applied in timestamp order. If two edits change the same field, the last edit wins. User A at the office changes "priority" to "High". Then user B, off network on an airplane, changes "priority" to "Medium". The priority shows as High at the office for a while, until user gets back and syncs, at which point the priority changes to "Medium". If two edits append to the same field, then the text is appended in timestamp order. This means remarks appended by user B while she was in flight get intercolated in the middle of other comments when B syncs. -- D. Richard Hipp d...@sqlite.org _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users