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
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Douglas Trujillo
date: 2015-05-31 23:36:11.000000000

Uploaded patch set 7.

-------------------------------------
author: Brenden Conley
date: 2015-05-31 23:36:18.000000000

Patch Set 7:

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

-------------------------------------
author: Douglas Trujillo
date: 2015-05-31 23:37:29.000000000

Patch Set 7: Code-Review+2

- rebased
- improved grammar of texts

-------------------------------------
author: Brenden Conley
date: 2015-05-31 23:52:52.000000000

Patch Set 7: Verified+1

Build Successful 

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

-------------------------------------
author: Douglas Trujillo
date: 2015-06-01 07:21:14.000000000

Change has been successfully merged into the git repository.

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