ultimatepp/uppbox/Scripts/git-merge.txt
cxl 703c9aa621 .uppbox
git-svn-id: svn://ultimatepp.org/upp/trunk@14084 f0d560ea-af0d-0410-9eb7-867de7ffcac7
2020-02-25 15:21:25 +00:00

15 lines
355 B
Text

cd ~/pr.upp.git # do not do this in upp.git
# copy this text from from github:
git checkout -b <source-branch-name> master
git pull https://github.com/theriverman/ultimatepp.git master
# (it will need to merge to current master)
# now merge and commit to svn
git checkout master
git merge --no-ff <source-branch-name>
git svn dcommit