From 1b93872000b59f8f5b971ba7f2cc831f40805314 Mon Sep 17 00:00:00 2001
From: Rhys Smith <rhys.smith@jisc.ac.uk>
Date: Mon, 5 Sep 2016 10:44:25 +0100
Subject: [PATCH] Remove ff-only requirement of merge of immediate into
 deferred branch

As it'll never succeed. We'll just have to let it have a go at merging
normally, and fail if there are any merge issues.
---
 build.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build.xml b/build.xml
index ea198428..80d3a0a5 100644
--- a/build.xml
+++ b/build.xml
@@ -810,7 +810,6 @@
         <exec executable="${git.executable}" dir="${shared.ws.dir}/${git.repo.project.data}" failonerror="true">
             <arg value="merge"/>
             <arg value="immediate"/>
-            <arg value="--ff-only"/>
             <arg value="-m"/>
             <arg value="'Merging immedate branch into deferred branch.'"/>
         </exec>