git: Always delete and checkout main branch to avoid merge conflicts 2

KA2107 · May 6, 2012 · c7e60e3 · c7e60e3
1 parent b974fad
commit c7e60e3
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/git/git_update.sh b/git/git_update.sh
@@ -104,15 +104,24 @@ _RUN()
 						_GIT_REMOTE_BRANCH='master'
 					fi
 
+					git checkout "${_GIT_REMOTE_BRANCH}"
+					echo
+
+					git merge "remotes/origin/${_GIT_REMOTE_BRANCH}"
+					echo
+
+					git reset --hard
+					echo
+
+					git checkout "remotes/origin/${_GIT_REMOTE_BRANCH}"
+					echo
+
 					git branch -D "${_GIT_REMOTE_BRANCH}"
 					echo
 
 					git checkout "${_GIT_REMOTE_BRANCH}"
 					echo
 
-					# git merge "remotes/origin/${_GIT_REMOTE_BRANCH}"
-					# echo
-
 					git reset --hard
 					echo
 				fi