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

Bug 345684

Summary:	Parallel delete/modify results in a CONFLICTING merge but getConflicting() is null
Product:	[Technology] JGit	Reporter:	Bernard Leach <leachbj>
Component:	JGit	Assignee:	Bernard Leach <leachbj>
Status:	RESOLVED FIXED	QA Contact:
Severity:	normal
Priority:	P3	CC:	caniszczyk, lcf
Version:	unspecified
Target Milestone:	1.0.0
Hardware:	All
OS:	All
Whiteboard:

Description Bernard Leach

2011-05-13 01:59:40 EDT

During a merge that has a delete/modify conflict the MergeCommand returns a CONFLICTING result but getConflicting() is null.  This results in a NullPointerException in org.eclipse.jgit.pgm.Merge.

See http://code.google.com/p/gerrit/issues/detail?id=927

Comment 1 Bernard Leach

2011-05-13 02:00:52 EDT

Proposed fix;

http://egit.eclipse.org/r/#change,3409

Comment 2 Chris Aniszczyk

2011-05-19 10:28:16 EDT

Fixed as 5ec4977bb514ec8eb01dd22c3e908fe3fe6da83f.

Thanks Bernard!