Re: [sc-dev] [supercollider/supercollider] bf8c91: class library: bitTest method minor speed improvem...

[Scott Wilson <i@xxxxxxxxxxxxxx>]

Okay, if you're sure that's what happened. I'd assumed that's what that merge commit was, but Fredrik said it was a mistake.

If it's fine, then we can leave as is.

S.

On 2 Nov 2013, at 09:23, Dan Stowell <danstowell+sc3@xxxxxxxxx> wrote:

> As commented here
> https://github.com/supercollider/supercollider/pull/989#issuecomment-27618505
> there's v likely something not right about that pull request. Are you
> sure there's something needing fixing? Normally it's harmless to have
> a commit that updates the other branch to match with updated content
> from master.
> 
> Dan
> 
> 
> 
> 2013/11/1 Scott Wilson <i@xxxxxxxxxxxxxx>:
>> I'd probably just revert it in master and push as, that avoids an additional merge commit, but others may have a different opinion.
>> 
>> S.
>> 
>> On 1 Nov 2013, at 22:14, Fredrik Olofsson <f@xxxxxxxxxxxxxxxxxxx> wrote:
>> 
>>> ok, i managed to revert the commit with the GitHub application.
>>> and then i issued a new pull request... https://github.com/supercollider/supercollider/pull/989
>>> 
>>> is this how you are supposed to do it?
>>> _f
>>> 
>>> 1 nov 2013 kl. 22:42 skrev Fredrik Olofsson <f@xxxxxxxxxxxxxxxxxxx>:
>>> 
>>>> hm, i need help with this.  how can i revert?  is one of these answers an option?  http://stackoverflow.com/questions/12339568/github-remove-commit-from-a-merge
>>>> (sorry to be so helpless - not really sure what i'm doing when it comes to git)
>>>> _f
>>>> 
>>>> 1 nov 2013 kl. 21:24 skrev Scott Wilson <i@xxxxxxxxxxxxxx>:
>>>> 
>>>>> Oops! can you revert that please?
>>>>> 
>>>>> On 1 Nov 2013, at 16:11, Fredrik Olofsson <f@xxxxxxxxxxxxxxxxxxx> wrote:
>>>>> 
>>>>>> thanks Scott.
>>>>>> 
>>>>>> but for the "Merge remote-tracking branch 'upstream/master'"... https://github.com/supercollider/supercollider/commit/3d1ca4fd93a773ab114e474790b32a6e1732eb97
>>>>>> i must have done something very wrong.  don't think that should go into git master.
>>>>>> 
>>>>>> _f
>>> 
>>> 
>>> #|
>>>    fredrikolofsson.com     musicalfieldsforever.com
>>> |#
>>> 
>>> 
>>> _______________________________________________
>>> sc-dev mailing list
>>> 
>>> info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
>>> archive: https://listarc.bham.ac.uk/marchives/sc-dev/
>>> search: https://listarc.bham.ac.uk/lists/sc-dev/search/
>> 
>> 
>> _______________________________________________
>> sc-dev mailing list
>> 
>> info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
>> archive: https://listarc.bham.ac.uk/marchives/sc-dev/
>> search: https://listarc.bham.ac.uk/lists/sc-dev/search/
> 
> 
> 
> -- 
> http://www.mcld.co.uk
> 
> _______________________________________________
> sc-dev mailing list
> 
> info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
> archive: https://listarc.bham.ac.uk/marchives/sc-dev/
> search: https://listarc.bham.ac.uk/lists/sc-dev/search/


_______________________________________________
sc-dev mailing list

info (subscription, etc.): http://www.beast.bham.ac.uk/research/sc_mailing_lists.shtml
archive: https://listarc.bham.ac.uk/marchives/sc-dev/
search: https://listarc.bham.ac.uk/lists/sc-dev/search/