|Default Merge-conflict per branch point type? [message #539740]
||Sat, 12 June 2010 13:52
| Henrik Lindberg
Registered: July 2009
What are the reasonable defaults for on-merge-conflict for the different
branch point types?
I set the default to FAIL, but I don't know if that is the most
convenient when working with LATEST. But I thought it would be the
safest, and would force someone to specify otherwise if they want
The other options would be USE_WORKSPACE, as USE_SCM is not safe (drops
For all other than LATEST, a default of FAIL seems reasonable.
What do you think?
Powered by FUDForum
. Page generated in 0.02347 seconds