On Wed, Jul 10, 2013 at 11:57 AM, Harald Oehlmann < [email protected]> wrote:
> Am 10.07.2013 11:51, schrieb Stephan Beal: > ... > > Closing at merging is also not ideal because it often happens that a > > merge gets tossed out in the process of trying to fix conflicts (very > > often i have non-trivial merge conflicts i end up tossing out the merge > > and starting over from a different angle). > > Very good idea ! > i might have over-thought that problem: closing on merge "probably" isn't a problem here because if the leaf is closed that doesn't hinder us at all. Closing a leaf keeps us from committing to it, but not from pulling from it. To me closing at merge time sounds like the overall easier approach (but i'm very possibly ignoring/missing details/complications which i'm hoping another list member will point out). Gruss aus Muenchen, -- ----- stephan beal http://wanderinghorse.net/home/stephan/ http://gplus.to/sgbeal
_______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
