Collaborative ALM
Free SaaS for open source projects on Amazon EC2
Login | About  
 
   
   
[CRQ-10799]  -  Conflicts do not open into the conflict editor by default
Tags:   No tags associated yet.
All Tags...
Go Back
  0  
 Tracker:  Change Request  Priority:  Normal  Status:  Unconfirmed
 Submitted by:  npiguet Jan 14 10:04  Modified by:  hgeclipse Mar 13 10:51  Assigned to:  hgeclipse Jan 14 10:04
 Category:  Merge  Severity:  Major  Resolution:  Implemented
 Target:  --  Detected:  --
Description:
It is only possible to open conflicts in the conflict editor when opening a file from the merge list view. Clicking on a conflicted file in the package explorer should open them in the conflicts editor (and use a 3-way conflict editor if possible)
Details:
Comments (3)
Attachments (0)
Children (0)
Associations (1)
SCM Commits (0)
All (3)

Submitted File Size Comment
Nothing found to display.