diff --git a/hgext3rd/pushrebase.py b/hgext3rd/pushrebase.py
--- a/hgext3rd/pushrebase.py
+++ b/hgext3rd/pushrebase.py
@@ -589,8 +589,11 @@
             conflicts = findconflictsfast()
 
         if conflicts:
-            raise error.Abort(_('conflicting changes in:\n%s') %
-                             ''.join('    %s\n' % f for f in sorted(conflicts)))
+            msg = (_('conflicting changes in:\n%s\n') %
+                    ''.join('    %s\n' % f for f in sorted(conflicts))).strip()
+            hint = _('please pull and rebase your changes locally, then try '
+                      'again')
+            raise error.Abort(msg, hint=hint)
 
     return revs, oldonto
 
diff --git a/tests/test-pushrebase.t b/tests/test-pushrebase.t
--- a/tests/test-pushrebase.t
+++ b/tests/test-pushrebase.t
@@ -225,7 +225,7 @@
   searching for changes
   remote: conflicting changes in:
       a
-  
+  remote: (please pull and rebase your changes locally, then try again)
   abort: push failed on remote
   [255]
 
@@ -259,7 +259,7 @@
   searching for changes
   remote: conflicting changes in:
       a
-  
+  remote: (please pull and rebase your changes locally, then try again)
   abort: push failed on remote
   [255]
 
@@ -934,6 +934,6 @@
   searching for changes
   abort: conflicting changes in:
       A
-  
+  (please pull and rebase your changes locally, then try again)
   [255]