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

Bug 344870

Summary:	Merge conflicts need dialog
Product:	[Tools] PTP	Reporter:	Greg Watson <g.watson>
Component:	RDT.sync	Assignee:	John Eblen <jdeblen1>
Status:	CLOSED FIXED	QA Contact:
Severity:	normal
Priority:	P3	CC:	roland
Version:	5.0
Target Milestone:	---
Hardware:	PC
OS:	Mac OS X - Carbon (unsup.)
Whiteboard:

Description Greg Watson

2011-05-05 13:25:30 EDT

If I get merge conflicts, currently this is only logged in error log, which may not be visible so I don't know why the project will not sync. This needs a dialog or something that interacts with the user.

Comment 1 Greg Watson

2011-05-06 17:36:29 EDT

Assigning to John.

Comment 2 Roland Schulz

2011-05-16 13:41:45 EDT

No merge view yet (planned). But basic requirement fixed with 345868.

Comment 3 Greg Watson

2011-05-16 14:37:34 EDT

Might be worth keeping this open as a reminder.

Comment 4 Roland Schulz

2011-05-16 16:11:39 EDT

for our internal coordination we use https://github.com/rolandschulz/PTP/issues
this is less formal and we don't swamp bugzilla with all our internal communication.
I have it marked their as a reminder.