-
Notifications
You must be signed in to change notification settings - Fork 20
Home
Tres Finocchiaro edited this page Mar 18, 2018
·
5 revisions
Pull a patch from upstream:
git clone git://git.code.sf.net/p/zynaddsubfx/code zynaddsubfx-code
cd zynaddsubfx-code/
git remote add downstream https://github.com/lmms/zynaddsubfx
git fetch downstream
git checkout -b lmmsmaster downstream/master
git cherry-pick 417d49b # <-- hash of commit from upstream that's needed
#### if conflict, do the following:
# git diff --name-only --diff-filter=U
#### make adjustments to offending files
# git add add src/Synth/OscilGen.cpp # <-- offending file name(s)
# git cherry-pick --continue
git push downstream lmmsmaster:master