opendev/gerrit
Code Issues Proposed changes

Add tooltip on 'Cannot Merge' telling that a rebase is needed

Browse Source 
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>
This commit is contained in:
Edwin Kempin
2013-11-25 16:05:32 +01:00
committed by Shawn Pearce
parent b376b5bfc8
commit efad906025
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-gwtui/src/main/java/com/google/gerrit/client/change/ChangeScreen2.ui.xml
View File

@@ -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>