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

Bug 326525

Summary: Graphical conflict resolution view
Product: [Technology] EGit Reporter: Gena <gb>
Component: UIAssignee: Project Inbox <egit.ui-inbox>
Status: RESOLVED FIXED QA Contact:
Severity: enhancement    
Priority: P3 CC: gb, info, manuel.doninger, matthias.sohn, nicolas.deloof
Version: unspecified   
Target Milestone: 0.10.0-M2   
Hardware: All   
OS: All   
Whiteboard:

Description Gena CLA 2010-09-29 08:29:12 EDT 
Build Identifier: Eclipse Helios Service Release 1 Build id: 20100917-0705, EGit 0.9.3

Required is the possibility to resolve conflicts within the graphical view. This view (view set) should be, as far as possible, aware of the structure of the conflicting documents just like it's already implemented by popular subversion clients for eclipse.

We think, this feature could be a great improvement of a usability of the Egit client. This is the only feature we are missing now, before we do completely switch to git/Egit solution.

Thank you for a good job!

Sivs Team Karlsruhe


Reproducible: Always

Steps to Reproduce:
It seems to be not implemented yet.
Comment 1 Gena CLA 2010-09-29 08:30:40 EDT 
The corresponding discussion can be found here http://www.eclipse.org/forums/index.php?t=msg&th=197222&start=0&S=b24cbbe7a14e2e37a6f52bb553abf573
Comment 2 Matthias Sohn CLA 2010-10-20 04:30:42 EDT 
*** Bug 322876 has been marked as a duplicate of this bug. ***
Comment 3 Matthias Sohn CLA 2010-10-30 07:59:53 EDT 
code review at http://egit.eclipse.org/r/#change,1801

merged as 3da5049ced30cd79f15a7709ed8b121bca588f1b