[Build] Use merge instead of rebase from master to master_integration

sharpdx · Jul 25, 2013 · 52f096e · 52f096e
1 parent 3ed6e8e
commit 52f096e
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/SharpDX.build b/SharpDX.build
@@ -109,9 +109,10 @@
 	  <Exec Command='$(GitExe) checkout --merge "master"'/>
 	  <Exec Command='$(GitExe) pull --rebase origin'/>
 
-	  <!-- Rebase master_integration on master -->
+	  <!-- Merge master into master_integration -->
 	  <Exec Command='$(GitExe) checkout --merge "master_integration"'/>
-	  <Exec Command='$(GitExe) rebase "master"'/>
+    <Exec Command='$(GitExe) pull --rebase origin'/>
+    <Exec Command='$(GitExe) merge "master"'/>
 
 	  <!-- Merge master_integration into master -->
 	  <Exec Command='$(GitExe) checkout --merge "master"'/>