Index: /mergebot/trunk/mergebot/BranchActor.py
===================================================================
--- /mergebot/trunk/mergebot/BranchActor.py	(revision 28)
+++ /mergebot/trunk/mergebot/BranchActor.py	(revision 29)
@@ -51,4 +51,5 @@
             comment = 'Failed to create branch.'
             return results, comment, False
+
         results['mergebotstate'] = 'branched'
         comment = '\n'.join([
Index: /mergebot/trunk/mergebot/RebranchActor.py
===================================================================
--- /mergebot/trunk/mergebot/RebranchActor.py	(revision 28)
+++ /mergebot/trunk/mergebot/RebranchActor.py	(revision 29)
@@ -126,4 +126,5 @@
                     "commit your work to the branch.",
             ]) 
+            success = False # the rebranch failed because there were conflicts
         else: # No conflicts, do the commit.
             mergemessage = "\n".join([