This is true and a good reason to not commit non-working code but for those times where it inadvertently happens it would be nice to have the equivalent of gits "bisect skip".
On Wed, May 8, 2013 at 4:28 AM, Richard Hipp <[email protected]> wrote: > > > On Wed, May 8, 2013 at 6:56 AM, Lluís Batlle i Rossell > <[email protected]>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 > [email protected] > _______________________________________________ > fossil-users mailing list > [email protected] > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > >
_______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
