Add git-merge-master

Author: slathrop

README.md

@@ -221,7 +221,11 @@ When your branch has had no intervening changes since it was branched from, reba
 
 ### git-rebase-branch
 
-When your branch _does_ have intervening changes that cause it to differ from master, and commits have been applied to master that you want to be applied to your branch as well, this will do the job.
+When your branch _does_ have intervening changes that cause it to differ from master, and commits have been applied to master that you want to be applied to your branch as well, this will do the job. This script is formulated to minimize merge conflicts and "just work" most of the time by favoring the changes in the local branch over otherwise conflicting changes in master.
+
+### git-merge-master
+
+Merge master locally into your current branch, favoring the current branch's changes over master however. This avoids the duplicate "replay" of commits that can occur with rebasing.
 
 ### git-log
 

git-merge-master.bat

@@ -0,0 +1,25 @@
+@echo off
+
+echo.
+echo.
+
+git branch -a
+
+echo.
+echo.
+echo Before continuing, be sure that you have switched to a branch
+echo *other than* master.
+echo.
+echo Merge master locally into this branch, favoring this branch's changes over master...
+pause
+echo.
+echo.
+
+git merge -s recursive -X ours master
+
+echo.
+echo.
+echo When you are ready to push your merged changes
+echo to the remote server, run "git-update"
+echo.
+echo.

git-rebase-branch.bat

@@ -15,6 +15,7 @@ pause
 echo.
 echo.
 
-git rebase master
+REM "Ours" and "theirs" mean the opposite of what they do during a straight merge
+git rebase -s recursive -X theirs master
 
 echo.