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

Bug 360686

Summary: Make it easier to launch the Edit Conflicts editor, not just compare when file is in conflict
Product: [Technology] Subversive Reporter: Eddie Galvez <egalvez>
Component: UIAssignee: Igor Burilo <igor.burilo>
Status: CLOSED MOVED QA Contact:
Severity: normal    
Priority: P3    
Version: unspecified   
Target Milestone: ---   
Hardware: PC   
OS: Windows 7   
Whiteboard:

Description Eddie Galvez CLA 2011-10-12 11:42:10 EDT 
Build Identifier: 3.7.0

When a file is in conflict, the default compare operation (double-click in synchronize view) won't bring up the edit conflicts, but rather ends up trying to compare the file with the <<< markers. This is somewhat OK for text files (still not the best behaviour) but in our product we have an XML file that breaks parsing... and it's tricky to get the user to spot the "Edit Conflicts" contextual menu when they have never learnt it yet...

Reproducible: Always
Comment 1 Eclipse Webmaster CLA 2023-02-13 10:56:34 EST 
This issue has been migrated to https://gitlab.eclipse.org/eclipse/subversive/subversive/-/issues/90.