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

Help

Home

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

Show: Today's Messages :: Show Polls :: Message Navigator

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

Sat, 12 June 2010 13:52

Henrik Lindberg

Messages: 2509
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

Report message to a moderator

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

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Fri Nov 16 02:09:43 GMT 2018

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter