This operation (after onetime deleting) clause conflicts... each time...
^^^^^^^^^^^^^^^^^^^^^^ This is the problem.
(deleting your revision library and pristine trees is a part of a solution)
Since his revisions have been merged into the mainline, I believe that star-merge will be very unhappy if he tries to merge different revisions with the same name later. I believe the presence of patchlogs from the first timeline will cause star-merge to select the wrong base.
Aaron
_______________________________________________ Gnu-arch-users mailing list [email protected] http://lists.gnu.org/mailman/listinfo/gnu-arch-users
GNU arch home page: http://savannah.gnu.org/projects/gnu-arch/
