Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 335879

Summary:

Merge manager does not have enough options for handling conflicts

Product:

[Technology] OSEE

Reporter:

Nobody - feel free to take it <nobody>

Component:

OSEE Application Framework

Assignee:

Nobody - feel free to take it <nobody>

Status:

CLOSED FIXED

QA Contact:

Severity:

enhancement

Priority:

CC:

ryan.d.brooks

Version:

unspecified

Target Milestone:

0.9.8

Hardware:

All

OS:

All

Whiteboard:

Attachments:

Description	Flags
fix	ryan.d.brooks: iplog+

Description Nobody - feel free to take it

2011-01-31 12:17:56 EST

Build Identifier: 

When working with Merge Manager, it would be more efficient for the user to handle certain conflicts by multi-selecting.

Reproducible: Always

Comment 1 Nobody - feel free to take it

2011-01-31 12:31:21 EST

Created attachment 187983 [details]
fix

Comment 2 Ryan Brooks

2011-02-18 16:24:44 EST

Patch applied. With commit "feature[ats_K7L14]: Add multi-conflict resolution options to Merge Manager" on  Wed Jan 26 17:10:14 2011 -0700

Comment 3 Ryan Brooks

2011-02-18 16:25:47 EST

OSEE 0.9.8 has been released.