Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Modeling » B3 » Default Merge-conflict per branch point type?
Default Merge-conflict per branch point type? [message #539740] Sat, 12 June 2010 09:52
Henrik Lindberg is currently offline Henrik Lindberg
Messages: 2492
Registered: July 2009
Senior Member
Hi,
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
something else.

The other options would be USE_WORKSPACE, as USE_SCM is not safe (drops
changes).

For all other than LATEST, a default of FAIL seems reasonable.

What do you think?

- henrik
Previous Topic:Repositories and Providers
Next Topic:Default Merge-conflict per branch point type?
Goto Forum:
  


Current Time: Sat Apr 19 06:09:04 EDT 2014

Powered by FUDForum. Page generated in 0.16674 seconds