DESCRIPTION

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

- show warning when conflicts occurred
- provide branch information in detail area
- list files with conflicts in detail area

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

COMMENTS

author: Jamarion Hunt
date: 2015-05-30 09:03:02.000000000

Uploaded patch set 4.

-------------------------------------
author: Brenden Conley
date: 2015-05-30 09:03:09.000000000

Patch Set 4:

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

-------------------------------------
author: Brenden Conley
date: 2015-05-30 09:19:48.000000000

Patch Set 4: Verified+1

Build Successful 

https://hudson.eclipse.org/egit/job/egit.gerrit/7083/ : SUCCESS

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