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

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


COMMENTS

author: Jamarion Hunt
date: 2015-06-21 13:44:21.000000000

Uploaded patch set 2.

-------------------------------------
author: Brenden Conley
date: 2015-06-21 13:44:29.000000000

Patch Set 2:

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

-------------------------------------
author: Brenden Conley
date: 2015-06-21 14:01:26.000000000

Patch Set 2: Verified+1

Build Successful 

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

-------------------------------------
author: Jayvion Booth
date: 2015-07-05 13:47:58.000000000

Patch Set 3: Patch Set 2 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

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