Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 343595 - [sync] integrate merge tool into synchronize view
Summary: [sync] integrate merge tool into synchronize view
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: unspecified   Edit
Hardware: PC Linux
: P3 enhancement (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-04-21 13:21 EDT by Benjamin Muskalla CLA
Modified: 2011-07-19 16:42 EDT (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 Benjamin Muskalla CLA 2011-04-21 13:21:38 EDT 
We should try to come up with a workflow that allows merging of conflict inside the synchronize view.
Comment 1 Benjamin Muskalla CLA 2011-07-14 07:50:17 EDT 
Pushed change to http://egit.eclipse.org/r/#change,3876
Comment 2 Benjamin Muskalla CLA 2011-07-19 16:42:59 EDT 
This was merged with fbc1a75f682154c7e875d61b831d3fc29f49e3f1.