On Wed, May 08, 2013 at 07:28:59AM -0400, Richard Hipp 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.
In that case, maybe it'd be nice to keep some kind of commit tree also for wiki pages; a gui should be able to show the multiple leaves, if they happen. Nowadays, what would be 'multiple leaves' go unnoticed. A simple operation (similar to edit, just with the merge conflicts) could allow merging multiple leaves. What do you think? _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
