DESCRIPTION

[gitflow] explicitly notify the user about merge/rebase conflicts

Bug: 467535
Change-Id: I1283e4d5a8d625e9dddbad29256a4363dd8202e9
Signed-off-by: Jamarion Hunt xxx@xxx.xxx

COMMENTS

author: Jamarion Hunt
date: 2015-05-23 15:35:08.000000000

Uploaded patch set 1.

-------------------------------------
author: Brenden Conley
date: 2015-05-23 15:35:15.000000000

Patch Set 1:

Build Started https://hudson.eclipse.org/egit/job/egit.gerrit/7059/

-------------------------------------
author: Brenden Conley
date: 2015-05-23 15:36:11.000000000

Patch Set 1: Verified-1

Build Failed 

https://hudson.eclipse.org/egit/job/egit.gerrit/7059/ : FAILURE

-------------------------------------
author: Jamarion Hunt
date: 2015-05-24 18:21:56.000000000

Patch Set 2: Patch Set 1 was rebased

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