diff --git a/project.py b/project.py index 120264f..b8a347d 100644 --- a/project.py +++ b/project.py @@ -563,6 +563,15 @@ class Project(object): _info("[%s] Consider merging or rebasing the" " unpublished commits.", self.name) return True + else: + # We can fast-forward safely. + # + try: + self._FastForward(rev) + except GitError: + return False + self._CopyFiles() + return True if merge == rev: try: