This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

Bug 239448 - Improve 'Tree conflict' resolution
Summary: Improve 'Tree conflict' resolution
Status: NEW
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Subversion (show other bugs)
Version: 7.4
Hardware: PC Linux
: P3 normal (vote)
Assignee: Ondrej Vrabec
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-12-13 08:00 UTC by tomzi
Modified: 2013-12-13 08:00 UTC (History)
0 users

See Also:
Issue Type: ENHANCEMENT
Exception Reporter:

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 tomzi 2013-12-13 08:00:38 UTC 
It is currently completely unclear what happens if you 'accept current state' (or sth like that) when you click 'Yes' or 'No'

Apparently Tree conflicts happen in different situations eg when svn properties change -> Netbeans should differentiate these situations more carefully and provide better support to resolve these tree conflicts.


Product Version = NetBeans IDE 7.4 (Build 201310111528)
Operating System = Linux version 3.8.0-32-generic running on amd64
Java; VM; Vendor = 1.7.0_45
Runtime = Java HotSpot(TM) 64-Bit Server VM 24.45-b08