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

Bug 318439

Summary:	Enable commit after conflict resolution (w/o file selection)
Product:	[Technology] EGit	Reporter:	Matthias Sohn <matthias.sohn>
Component:	UI	Assignee:	Stefan Lay <stefan.lay>
Status:	RESOLVED FIXED	QA Contact:
Severity:	enhancement
Priority:	P3	CC:	jamesblackburn+eclipse, stefan.lay
Version:	unspecified
Target Milestone:	0.9.0-M2
Hardware:	All
OS:	All
Whiteboard:
Bug Depends on:
Bug Blocks:	303404

Description Matthias Sohn

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

2010-06-30 07:08:52 EDT

planned for 0.9.0-M1

Comment 2 Stefan Lay

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

2010-07-21 05:50:05 EDT

Review at http://egit.eclipse.org/r/#change,1159

Comment 4 Stefan Lay

2010-08-06 08:35:17 EDT

Fixed with 16cbcdddc1174277f45a58fd676c04849e368f8e