subject:"\[fossil\-users\] files with conflicts"

[fossil-users] files with conflicts

2012-02-18 Thread frantisek holop

hi there, is there a way to get the list of files having a conflict using fossil, as opposed to search for CONFLICT? what is the basic flow to solve a conflict when for example after fossil up several files show merge conflicts? -f -- i'm weird, but i'm saving up to be eccentric.

Re: [fossil-users] files with conflicts

2012-02-18 Thread Lluís Batlle i Rossell

On Sat, Feb 18, 2012 at 05:29:18PM +0100, frantisek holop wrote: is there a way to get the list of files having a conflict using fossil, as opposed to search for CONFLICT? what is the basic flow to solve a conflict when for example after fossil up several files show merge conflicts? What I