Midilist and -1

[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

[d.healey]

You can make a new branch based on any commit hash, or just based on Christoph's latests develop branch.

[ustk]

@d-healey Yeah new branch from a specific commit is the way to go. But I have a freakin authentication issue now, the git api messed up the authentication so the Desktop app is blocked too
You'll have to wait for me to fix this then after that I'll make the pull requests

[d.healey]

@ustk

You'll have to wait for me to fix this then after that I'll make the pull requests

No rush. It's always a pain setting up a new workflow like this but once you get it it makes things easier :)

[ustk]

@d-healey That's done :) although because I had n older commit, it is showing up in the pull request. I realized I could even base the new branches on an even older commit but it's too late... It'll be easier next time when my origin will be even with the upstream.

[d.healey]

@ustk My solution is to always branch from Christoph's develop branch, that way it doesn't matter how messed up my own fork is.