From efad906025d7efed4eb25622b1e32f55c4df5374 Mon Sep 17 00:00:00 2001
From: Edwin Kempin <edwin.kempin@sap.com>
Date: Mon, 25 Nov 2013 16:05:32 +0100
Subject: [PATCH] Add tooltip on 'Cannot Merge' telling that a rebase is needed

This give users a hint what they need to do if their change cannot be
merged due to a path conflict.

Change-Id: Ie6224f1597fc8e697bc891e1269256f84e5b3d25
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
---
 .../java/com/google/gerrit/client/change/ChangeScreen2.ui.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.ui.xml
index 8c6b5521e5..60ea911383 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.ui.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.ui.xml
@@ -426,7 +426,9 @@ limitations under the License.
                 <div ui:field='notMergeable'
                      class='{style.notMergeable}'
                      style='display: none'
-                     aria-hidden='true'>
+                     aria-hidden='true'
+                     title='The change cannot be merged due to a path conflict. Rebase the change locally and upload the rebased commit for review.'>
+                  <ui:attribute name='title'/>
                   <ui:msg>Cannot Merge</ui:msg>
                 </div>
               </td>