Help with the design for selecting audio capture device

[Foaly]

I used git rebase -i 005396d32 and replaced every "pick" with "squash". I got the error message: Can not 'squash' without previous commit.
Do I have to leave the first pick and only make every following to a squash?

[Foaly]

I don't know... I tryed for the last hours and I think I got it right now, excpet that I have to find out how to change the commit message 

[Nexus]

Yes sorry, there must be at least one "pick" (the first one). Thus, <rev> is the last commit before yours, so the rebase text file will contain all of your commits.

Use git commit --amend to change the last commit, or git rebase -i with "reword" instead of "pick".

[Foaly]

Alright I changed the commit message.
I'm not 100% sure that I did everything right, because there where some merge conflicts that I had to resolve. I hope I did everything right, but if somebody could have a look at it again, that would be great!
Other than that I think we are good to go now and thanks for the help!

[Hiura]

Nice. There are still two commits but it's already better. I think you can rebase with a branch too (instead of a commit sha). Something like `git rebase -i master` and squash the second commit into the first one.

[Foaly]

I tryed that and now everything is in one commit. I think we are good to go now! 
Thanks again!
I found a site that shows how to squash all commit of a pull request into one (of course you always find those things after you're done... but maybe it's helpful for the next person).

[Laurent]

I think something is wrong. Look at setDevice for example, it's not the latest version of the code.

I hope you kept a local copy of the code before you merged everything

[Nexus]

I hope you kept a local copy of the code before you merged everything

Otherwise, there's still git reflog

[Foaly]

For fuck sacks... I knew something like that would happen! Of course I didn't back the files up before I merged them. How can I restore them?

edit: I took a look at setDevice again and I don't noticed anything wrong. What did you see that is wrong?

[Laurent]

The latest code was:

if (device.empty())
    m_deviceName = getDefaultDevice();
else
    m_deviceName = device;

...

[Nexus]

How can I restore them?

Read my post

[Foaly]

Laurent are you 100% sure it was like that? Because I am almost certainly sure, that there was never a variable device (because of the confusion with the actual device handle). I always used name or deviceName. And also the latest commit moved the // Store name block to the top of the method, where it is now. So maybe there is nothing wrong.

[Nexus]

Of course you can also guess, if you prefer that to checking the reflog.

[Laurent]

Indeed it looks ok. I must have looked at the wrong commit. But you'd better be 100% sure, manual checking won't be enough, there were so many changes to the code.

[Foaly]

So what should I do?