Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 344870 - Merge conflicts need dialog
Summary: Merge conflicts need dialog
Status: CLOSED FIXED
Alias: None
Product: PTP
Classification: Tools
Component: RDT.sync (show other bugs)
Version: 5.0   Edit
Hardware: PC Mac OS X - Carbon (unsup.)
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: John Eblen CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-05-05 13:25 EDT by Greg Watson CLA
Modified: 2011-05-16 16:11 EDT (History)
1 user (show)

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 Greg Watson CLA 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 CLA 2011-05-06 17:36:29 EDT 
Assigning to John.
Comment 2 Roland Schulz CLA 2011-05-16 13:41:45 EDT 
No merge view yet (planned). But basic requirement fixed with 345868.
Comment 3 Greg Watson CLA 2011-05-16 14:37:34 EDT 
Might be worth keeping this open as a reminder.
Comment 4 Roland Schulz CLA 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.