From 5cad54578cd0bd33d8c61cf40b74d41122449c35 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Mon, 25 Jun 2012 17:37:37 +0200
Subject: [PATCH] MINOR Auto conflict merges in phing translation tasks

Also set some default values when targets are executed
individually, and ensure that text collection fails the build if required
---
 build.xml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index 08f2a08..016ee82 100644
--- a/build.xml
+++ b/build.xml
@@ -408,13 +408,16 @@ Your friendly automated release script.
 	<target name="translations-staging-setup">
 		<propertyprompt propertyName="module" 
 			promptText="Module name?"
-			useExistingValue="true" />
+			useExistingValue="true"
+			defaultValue="framework" />
 		<propertyprompt propertyName="getlocalization.${module}.project" 
 			promptText="getlocalization project"
-			useExistingValue="true" />
+			useExistingValue="true"
+			defaultValue="sapphire" />
 		<propertyprompt propertyName="getlocalization.${module}.user" 
 			promptText="getlocalization username"
-			useExistingValue="true" />
+			useExistingValue="true"
+			defaultValue="silverstripe" />
 		<propertyprompt propertyName="getlocalization.${module}.password" 
 			promptText="getlocalization password"
 			useExistingValue="true" />
@@ -432,8 +435,8 @@ Your friendly automated release script.
 	<target name="translations-update-git-masterfile" 
 		description="Collect translation on a module, commit them into a specialized branch and push to the origin repository."
 		depends="translations-staging-setup">
-		<exec command="git merge origin/master" dir="${module}" checkreturn="true" />
-		<exec command="php framework/cli-script.php dev/tasks/i18nTextCollectorTask" passthru="true" />		
+		<exec command="git merge --strategy recursive -X theirs origin/master" dir="${module}" checkreturn="true" />
+		<exec command="php framework/cli-script.php dev/tasks/i18nTextCollectorTask" passthru="true" checkreturn="true" />		
 		<exec command="git status --short" dir="${module}" outputProperty="git.status.${module}" />
 		<if>
 			<istrue value="${git.status.${module}}" />