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 usually do is keep the terminal open, and using the scrollback buffer to check every conflict one after the other in another terminal. I'd welcome some command "fossil conflict list/clear/..." that helped not forgetting conflicts. It could be non-blocking, just keeping the list, not as in svn (which requires 'resolve'). Regards, Lluís. _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
