larsberg · October 27, 2015 18:59
diff --git a/git-overwrite-branch.sh b/git-overwrite-branch.sh
 # overwrite master with contents of seotweaks branch (seotweaks > master)
 git checkout seotweaks    # source name
 git merge -s ours master  # target name
 git checkout master       # target name
 git merge seotweaks       # source name
	# overwrite master with contents of seotweaks branch (seotweaks > master)
	git checkout seotweaks # source name
	git merge -s ours master # target name
	git checkout master # target name
	git merge seotweaks # source name