DESCRIPTION

Avoid NPE on conflict during gerrit checkout

Bug: 511610
Change-Id: Ie1b9de2aed2fbaa255b97a76565c0da417c492e0
Signed-off-by: Jayvion Booth xxx@xxx.xxx
(cherry picked from commit 8549e454491ed6f37689ead035dd356f3b639e4c)


COMMENTS

author: Douglas Trujillo
date: 2017-03-06 23:10:01.000000000

Uploaded patch set 1.

-------------------------------------
author: Brenden Conley
date: 2017-03-06 23:10:07.000000000

Patch Set 1:

Build Started https://hudson.eclipse.org/egit/job/egit-stable.gerrit/933/

-------------------------------------
author: Douglas Trujillo
date: 2017-03-06 23:25:28.000000000

Patch Set 1: Code-Review+2 Verified+1

-------------------------------------
author: Gerrit Johnathan Pham
date: 2017-03-06 23:25:33.000000000

Change has been successfully merged into the git repository by Douglas Trujillo

-------------------------------------
author: Brenden Conley
date: 2017-03-06 23:25:53.000000000

Patch Set 1:

Build Failed 

https://hudson.eclipse.org/egit/job/egit-stable.gerrit/933/ : ABORTED

-------------------------------------
