summaryrefslogtreecommitdiffstats
path: root/project.py
diff options
context:
space:
mode:
Diffstat (limited to 'project.py')
-rw-r--r--project.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/project.py b/project.py
index 6621f1cb..b19ab5fb 100644
--- a/project.py
+++ b/project.py
@@ -637,7 +637,6 @@ class Project(object):
637 "branch %s is published but is now %d commits behind", 637 "branch %s is published but is now %d commits behind",
638 branch.name, 638 branch.name,
639 len(upstream_gain)) 639 len(upstream_gain))
640 syncbuf.info(self, "consider merging or rebasing the unpublished commits")
641 return 640 return
642 elif upstream_gain: 641 elif upstream_gain:
643 # We can fast-forward safely. 642 # We can fast-forward safely.