DESCRIPTION

[gitflow] Fix feature rebase which sometimes fails silently

- always show warning message if rebase operation was unsuccessful
- fix conflict warning for non-feature finish operations
- refactoring to avoid redundancy
- fix UI test and add test for dirty working dir

Bug: 470434
Change-Id: I963b61768add59d65070f0b193ef91eade95f28a
Signed-off-by: Jamarion Hunt xxx@xxx.xxx
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Douglas Trujillo
date: 2015-07-22 22:41:10.000000000

Uploaded patch set 8.

-------------------------------------
author: Brenden Conley
date: 2015-07-22 22:41:16.000000000

Patch Set 8:

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

-------------------------------------
author: Douglas Trujillo
date: 2015-07-22 22:42:14.000000000

Patch Set 8: Code-Review+2

- added gitflow feature to ui.test's dependencies in maven build
- improved commit message

-------------------------------------
author: Brenden Conley
date: 2015-07-22 23:02:30.000000000

Patch Set 8: Verified+1

Build Successful 

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

-------------------------------------
author: Gerrit Johnathan Pham
date: 2015-07-22 23:16:53.000000000

Change has been successfully merged into the git repository by Douglas Trujillo

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