On Tue, Oct 19, 2010 at 08:57:27AM -0400, Richard Hipp wrote: > 2010/10/19 Lluís Batlle i Rossell <[email protected]> > > > > > I like this behaviour intended. > > I just had the case of having a branch from trunk, and it had some changes > > I > > wanted to merge in to trunk, but I did not want all of them. So I can > > create a > > subbranch of 'branch', prepare it as I want it merged into trunk, and from > > trunk > > I can do: > > fossil merge subbranch > > > > But I wonder if a later merge in trunk like this will work fine: > > fossil merge branch > > > > Yes. You can "fossil merge branch" as often as you like and it will continue > to work. Unlike another popular VCS, Fossil keeps track of past merges and > does not duplicate them causing merge conflicts.
I even tried in branch 'fossil update trunk' after the merge from subbranch to trunk, and all went perfect. I am very positively impressed. Thank you! _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
