diff --git a/merge.sh b/merge.sh new file mode 100755 index 0000000..501bf69 --- /dev/null +++ b/merge.sh @@ -0,0 +1,3 @@ +git checkout prod +git merge --no-ff --no-commit origin/master +git checkout HEAD -- pom.xml