Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 360686 - Make it easier to launch the Edit Conflicts editor, not just compare when file is in conflict
Summary: Make it easier to launch the Edit Conflicts editor, not just compare when fil...
Status: CLOSED MOVED
Alias: None
Product: Subversive
Classification: Technology
Component: UI (show other bugs)
Version: unspecified   Edit
Hardware: PC Windows 7
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Igor Burilo CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-10-12 11:42 EDT by Eddie Galvez CLA
Modified: 2023-02-13 10:56 EST (History)
0 users

See Also:

Attachments
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 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.