Eclipse Community Forums: B3 » Default Merge-conflict per branch point type?

Home » Archived » B3 » Default Merge-conflict per branch point type?

Default Merge-conflict per branch point type? [message #608544]

Sat, 12 June 2010 09:52

Eclipse User

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:	Default Merge-conflict per branch point type?
Next Topic:	Repositories and Providers

Goto Forum:

-=] Back to Top [=-

Current Time: Sun Jul 13 14:30:19 EDT 2025

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter