On Thu, Jul 7, 2011 at 8:34 AM, John Sparrow <[email protected]> wrote: > Just trying out 2.2.1, excellent, thanks to everyone. > > When I update to a revison, there are some options, 2 of which are: A) > always merge, and B) automatically resolve merge conflicts > > Is B only a valid choice if A is selected? Or if it's meaningful to select B > only, how would this work?
"Always Merge" disables the merge/discard/commit prompt. "Automatically resolve merge conflicts" is applicable whether "Always Merge" is enabled or not. It determines whether trivial conflicts are resolved as they are detected, or whether they are queued up for resolve in the resolve tool. -- Steve Borho ------------------------------------------------------------------------------ All of the data generated in your IT infrastructure is seriously valuable. Why? It contains a definitive record of application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-d2d-c2 _______________________________________________ Tortoisehg-discuss mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/tortoisehg-discuss
