strarsis · August 15, 2024 21:12
diff --git a/git-overwrite-branch.sh b/git-overwrite-branch.sh
 # overwrite master with contents of feature branch (feature > master)
 git checkout feature      # source name
 git merge -s ours master  # target name
 git checkout master       # target name
 git merge feature         # source name
	# overwrite master with contents of feature branch (feature > master)
	git checkout feature # source name
	git merge -s ours master # target name
	git checkout master # target name
	git merge feature # source name