DESCRIPTION

[gitflow] feature rebase sometimes fails silently

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

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


COMMENTS

author: Jamarion Hunt
date: 2015-07-08 09:12:16.000000000

Uploaded patch set 5.

-------------------------------------
author: Brenden Conley
date: 2015-07-08 09:12:23.000000000

Patch Set 5:

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

-------------------------------------
author: Brenden Conley
date: 2015-07-08 09:34:20.000000000

Patch Set 5: Verified+1

Build Successful 

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

-------------------------------------
author: Jamarion Hunt
date: 2015-07-10 11:57:18.000000000

Patch Set 6: Patch Set 5 was rebased

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

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

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