Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 335879 - Merge manager does not have enough options for handling conflicts
Summary: Merge manager does not have enough options for handling conflicts
Status: CLOSED FIXED
Alias: None
Product: OSEE
Classification: Technology
Component: OSEE Application Framework (show other bugs)
Version: unspecified   Edit
Hardware: All All
: P3 enhancement (vote)
Target Milestone: 0.9.8   Edit
Assignee: Nobody - feel free to take it CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-01-31 12:17 EST by Nobody - feel free to take it CLA
Modified: 2011-03-29 12:39 EDT (History)
1 user (show)

See Also:

Attachments
fix (18.72 KB, patch)
2011-01-31 12:31 EST, Nobody - feel free to take it CLA 		ryan.d.brooks: iplog+
Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Nobody - feel free to take it CLA 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 CLA 2011-01-31 12:31:21 EST 
Created attachment 187983 [details]
fix
Comment 2 Ryan Brooks CLA 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 CLA 2011-02-18 16:25:47 EST 
OSEE 0.9.8 has been released.