DESCRIPTION

StagingView: show info message when rebase conflicts have been resolved

Show a hint what to do next after having resolved rebase conflicts.

Bug: 512446
Change-Id: I44e1a312529d0fef4827b84c6258b705e2c7765b
Signed-off-by: Douglas Trujillo xxx@xxx.xxx

COMMENTS

author: Douglas Trujillo
date: 2017-02-20 20:26:27.000000000

Uploaded patch set 2.

-------------------------------------
author: Brenden Conley
date: 2017-02-20 20:41:26.000000000

Patch Set 2:

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

-------------------------------------
author: Brenden Conley
date: 2017-02-20 21:04:37.000000000

Patch Set 2: Verified+1

Build Successful 

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

-------------------------------------
author: Kaeden Tapia
date: 2017-02-21 14:55:08.000000000

Patch Set 2:

This looks quite promising! Thanks a lot!

Just quickly looking at the code, I think the hint will be shown in other cases where it probably shouldn't. When you're edited a commit for example?

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