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: Brenden Conley
date: 2015-05-24 18:22:03.000000000

Patch Set 2:

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

-------------------------------------
author: Brenden Conley
date: 2015-05-24 18:22:56.000000000

Patch Set 2: Verified-1

Build Failed 

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

-------------------------------------
author: Douglas Trujillo
date: 2015-05-25 20:23:31.000000000

Patch Set 3: Patch Set 2 was rebased

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