-
Notifications
You must be signed in to change notification settings - Fork 404
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Readme.MD, Premake5, Swedish comment translation to English in code, au-package.sh quickfix, wavetable rmb quickfix, alert on mac if no configuration.xml #68
Readme.MD, Premake5, Swedish comment translation to English in code, au-package.sh quickfix, wavetable rmb quickfix, alert on mac if no configuration.xml #68
Conversation
Moved all References to the bottom of the file
Beautification of premake5 while adding audiounit.framework
Google Translate + Human translate of Swedish into English. Content accuracy is debatable.
google+human translate swedish-english
simultainously -> simultaneously
Added @baconpaul 's quickfix from #89 for mac.( link to commit baconpaul@e5737f0 ) |
@esaruoho fix for #77 is kurasu@7be5243 |
I think we should maybe just have one big pull request which gets us to zoomable ui plus all your fixes then give the maintainers one thing to review rather than these scattered cross commits I have one commitnfor the logo display but otherwise my code is done and meegable Would someone like to take a crack at making a branch which rldoes these merges or making a super pr? |
@baconpaul I agree, it would be much easier to review and fix in one spot. I can make a PR with all the combined stuff later today |
Great and then we can close the rest and all avoid branching hell!
Baconpaul branch “zoomable-ui” contains all my changes including the stuff in #69 but like I said I have a 2 line change to commit and I’m out and about now so if you can either give me perms to add to the pr or prep for one last commit that would be great.
Fun stuff! Thank you
- Paul
On Dec 16, 2018, at 12:14, Keith Zantow <[email protected]<mailto:[email protected]>> wrote:
@baconpaul<https://github.com/baconpaul> I agree, it would be much easier to review and fix in one spot. I can make a PR with all the combined stuff later today
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub<https://github.com/kurasu/surge/pull/68#issuecomment-447659788>, or mute the thread<https://github.com/notifications/unsubscribe-auth/AMxHKVmVMSMfK1OBGNPj5YNVlb83n1oTks5u5n9ugaJpZM4ZSDby>.
|
Add Surge.pdf documentation
PR #70 content added |
@baconpaul @kzantow i merged a couple of things into this (like the surge pdf, and #70 ..) but was unable to add zoomable-ui into the mix due to issues. i'm also worried about this: was trying to get my fork in sync with the main repo and i guess i failed? |
Oooh that diff is a bit odd. I would not include that. Which pull request are we using for the "master"? Shall we just use #69? I am happy to add zoomable-ui to that now and then for the rest to get added in? |
@baconpaul yeah i was doing my head in trying to cherry-pick commits from this branch into another branch, but i just don't know enough git-fu to get rid of that diff or to remove it from the branch or something. really confusing. i wish i knew how. |
From https://stackoverflow.com/questions/36168839/how-to-remove-commits-from-a-pull-request
where is the branch in your forked repo with all of this and is c4c6a08 but at some points in git merge hell it's easier to start a new branch and remerge and redo a PR. Which is why branching is a bit tricky when dev cadence is faster than merge cadence. |
@baconpaul hmm.. i'm getting this
and
and
and
.. ouch |
Yuck. I’m not sure then. |
I'll try and figure it out. Thing is, my fork has that diff there already, since I tried to update the fork so it'd be in-tune with kurasu:surge. if i delete the fork, all the changes vanish too. ..don't feel like opening a second github account either.. surely there has to be a way? |
maybe if i could figure out a way of making a new branch from say, your branch, then i could start rebuilding a new PR. i'll investigate this tomorrow. mind you, it might be trivial for @kurasu to just remove the diff or something, but.. i guess we'll be wiser come monday-wednesday. |
@esaruoho looks like @kzantow has got most of this pulled into his #92 without this weird diff. He definitely got all of my key changes into that PR and I closed #69 as a result. So perhaps close this one too and then we can just all use his #92 for the review and merge to get zoomable documented etc... all in place. |
all this everything in #92, so closing. |
This PR updates
README.md
(more links, moved to the bottom)Premake5.lua
(spaces replaced with tabs, beautification)au-package.sh
text so it talks about AudioUnit and not AU~/Library/Application Support/Surge
-folder.
and..
)@kurasu @kzantow @abique thoughts appreciated.
heads up, @baconpaul - not sure if these help but just on the offchance they do, have fun!
Fixes #67
Fixes #29 (Thanks @baconpaul!)
Fixes #89 (Thanks @baconpaul)
Fixes #77 (Thanks @kzantow)