Midilist and -1

[ustk]

@d-healey Do you still use -1 in midilist for any particular reason?
I remember I've fixed it but never made a pull request. So should I push it or not? I'm currently preparing for a big push...

Here's what the fix was about

[d.healey]

I adopted -99 because it was more reliable :)

I see you've been busy on github! Do you know how to use git cherry-pick?

[ustk]

@d-healey Ok so I abort this one thanks!
I don't use the terminal but GitHub Desktop so it's child easy! I reckon you're using the terminal so I can't help...

[d.healey]

@ustk I think the desktop one might have it as well, I only discovered it recently. cherry-pick allows you to put each pull request into a separate branch which means every change you make doesn't get added to the same pull request.

[ustk]

@d-healey Yeah that's what I use. So I have my own branch where I make all modifications, and I cherry-pick to develop ;)
It's a simple right-click on a commit, then select the target, that's it...

[d.healey]

@ustk What I mean is all of your changes are in one pull request - https://github.com/christophhart/HISE/pull/200. If you put each change into a separate branch they can be in different pull requests, then people like me can go and just take the bits we want :)

[ustk]

@d-healey Oh that's clever! :) But I don't know how to do it

[ustk]

@d-healey So you mean a new branch has to be created per commit you want to separate? It's cool but you'll get tens of branches if I understand well...

[d.healey]

@ustk

Make a new branch from the latest develop - give it a name like, fixed-download-abort-issue
Then cherry-pick the commit from your develop branch where you made that change

Better description is here - https://stackoverflow.com/a/25955829/1901367

It's cool but you'll get tens of branches if I understand well...

Yes, one of the great things about git is it doesn't care how many branches you have :) And once the pull request is complete the branch can be deleted. It doesn't have to be one branch per commit, it's one branch per pull request, a pull request might contain several commits that are all related.

[ustk]

@d-healey Yeah so it is how I understand it (of course pull requests don't necessarily have to be for one commit)
Effectively, once the merge is done the branches can be deleted. And that's a good thing because I don't want to deal with 60 branches...

[d.healey]

@ustk Yeah. I only found out about it recently and reformatted my massive pull request into lots of little ones. It made it easier for Christoph to check them all too and merge them.

[ustk]

@d-healey I wanted to say I'll do it this way from now, but it's even better if I can reformat this last pull request. Never done that though so let me check ;)

[d.healey]

@ustk Start making branches and cherry-pick the commits from your develop branch, then delete your current pull request.

[ustk]

@d-healey said in Midilist and -1:

then delete your current pull request.

This is what I'm looking for... how?

[ustk]

@d-healey I closed it, is that good?

[d.healey]

@ustk Yeah

[ustk]

@d-healey Ok. There's still a "delete branch" button but I'm a bit afraid of this one...
I already fucked up my develop a few days ago, so never be stupid twice the same week :)

[ustk]

@d-healey Ok so the thing now is that I still have all the commits in my develop. So I have to be careful not to make a pull request from develop until Christoph merges the separate ones.

[ustk]

@d-healey No in fact it's not as easy. Obviously I can't create a branch based on develop until I removed all these commits from it. And I'd prefer a delete over a dirty revert so I'll try to delete them first.

[d.healey]

@ustk Give me a few minutes and I'll give you a solution