Thus said paul on Fri, 08 May 2015 20:51:44 +0100: > For example, what's the difference between merge with baseline and > cherrypick? The documentation probably should explain that somewhere.
When you merge, you merge in all changes leading up to that baseline (e.g. if you merge in a branch, you get all commits made on that branch). When you cherrypick, you are getting just the changes represented by the UUID given. I think the documentation is fairly clear on this point: https://www.fossil-scm.org/index.html/help?cmd=merge Thanks, Andy -- TAI64 timestamp: 40000000554d1698 _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
