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:10:35.000000000

Uploaded patch set 6.

-------------------------------------
author: Brenden Conley
date: 2015-05-31 23:10:41.000000000

Patch Set 6:

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

-------------------------------------
author: Brenden Conley
date: 2015-05-31 23:27:28.000000000

Patch Set 6: Code-Review-1

Build Unstable 

https://hudson.eclipse.org/egit/job/egit.gerrit/7087/ : UNSTABLE

-------------------------------------
author: Douglas Trujillo
date: 2015-05-31 23:35:57.000000000

Patch Set 6: Code-Review-1

(1 comment)

Line:29, org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/uitext.properties -> s/Hotfix finish/Finishing hotfix/

similarily below

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

Patch Set 6:

(1 comment)

Line:29, org.eclipse.egit.gitflow.ui/src/org/eclipse/egit/gitflow/ui/internal/uitext.properties -> Done

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