On Wed, May 8, 2013 at 6:56 AM, Lluís Batlle i Rossell <vi...@viric.name>wrote:
> I don't see why most VCS tend (somehow propose) to *not commit* merge > conflicts before solving the conflicts. That makes the conflict solution > 'disappear' from the timeline. > One reason: Having non-working code in the tree makes doing a bisect very difficult. -- 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
