Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 318439 - Enable commit after conflict resolution (w/o file selection)
Summary: Enable commit after conflict resolution (w/o file selection)
Status: RESOLVED FIXED
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: unspecified   Edit
Hardware: All All
: P3 enhancement (vote)
Target Milestone: 0.9.0-M2   Edit
Assignee: Stefan Lay CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: 303404
  Show dependency tree
 
Reported: 2010-06-30 07:08 EDT by Matthias Sohn CLA
Modified: 2010-08-06 08:35 EDT (History)
2 users (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 Matthias Sohn CLA 2010-06-30 07:08:20 EDT 
In case a merge has conflicts and these conflicts have been resolved, commit needs to be enabled. File selection in the commit dialog needs to be locked down in this case.
Comment 1 Matthias Sohn CLA 2010-06-30 07:08:52 EDT 
planned for 0.9.0-M1
Comment 2 Stefan Lay CLA 2010-07-19 05:20:30 EDT 
We need to commit all changes, included the not staged ones. This is the current behaviour of EGit.

Therefore the commit command needs the -a option. This can be achieved using add -u. A proposal for add -u is submitted to gerrit:

http://egit.eclipse.org/r/#change,1147
Comment 3 Stefan Lay CLA 2010-07-21 05:50:05 EDT 
Review at http://egit.eclipse.org/r/#change,1159
Comment 4 Stefan Lay CLA 2010-08-06 08:35:17 EDT 
Fixed with 16cbcdddc1174277f45a58fd676c04849e368f8e