stonekate
commented
5 years ago I don't know why it won't merge, sorry :( It won't let me resolve conflicts either. I tried to do it from the commande line but it says it's already up to date.
Closed stonekate closed 5 years ago
stonekate
commented
5 years ago I don't know why it won't merge, sorry :( It won't let me resolve conflicts either. I tried to do it from the commande line but it says it's already up to date.
bnicenboim
commented
5 years ago sorry, only I can merge!
On Sun, Apr 14, 2019, 16:21 auskate notifications@github.com wrote:
I don't know why it won't merge, sorry :( It won't let me resolve conflicts either. I tried to do it from the commande line but it says it's already up to date.
— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/bnicenboim/eeguana/pull/84#issuecomment-482986417, or mute the thread https://github.com/notifications/unsubscribe-auth/AFtIeiHqbNGDr-CS2elnly68HO1YxAhPks5vgzl4gaJpZM4cupEY .
stonekate
commented
5 years ago yeah but usually it says it can be done automatically, i.e. you don't have to do (much) extra work :)
Not this time!
On Sun, Apr 14, 2019 at 4:23 PM Bruno Nicenboim notifications@github.com wrote:
sorry, only I can merge!
On Sun, Apr 14, 2019, 16:21 auskate notifications@github.com wrote:
I don't know why it won't merge, sorry :( It won't let me resolve conflicts either. I tried to do it from the commande line but it says it's already up to date.
— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/bnicenboim/eeguana/pull/84#issuecomment-482986417, or mute the thread < https://github.com/notifications/unsubscribe-auth/AFtIeiHqbNGDr-CS2elnly68HO1YxAhPks5vgzl4gaJpZM4cupEY
.
— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub https://github.com/bnicenboim/eeguana/pull/84#issuecomment-482986850, or mute the thread https://github.com/notifications/unsubscribe-auth/AMJVQSfC1koPfO-dFCWoPctKiY8ZPc91ks5vgznzgaJpZM4cupEY .
-- Kate Stone PhD candidate Vasishth Lab | Department of Linguistics Potsdam University, 14467 Potsdam, Germany https://auskate.github.io
bnicenboim
commented
5 years ago did you pull experimental?
On Sun, Apr 14, 2019, 16:30 auskate notifications@github.com wrote:
yeah but usually it says it can be done automatically, i.e. you don't have to do (much) extra work :)
Not this time!
On Sun, Apr 14, 2019 at 4:23 PM Bruno Nicenboim notifications@github.com wrote:
sorry, only I can merge!
On Sun, Apr 14, 2019, 16:21 auskate notifications@github.com wrote:
I don't know why it won't merge, sorry :( It won't let me resolve conflicts either. I tried to do it from the commande line but it says it's already up to date.
— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub <https://github.com/bnicenboim/eeguana/pull/84#issuecomment-482986417 , or mute the thread <
.
— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub https://github.com/bnicenboim/eeguana/pull/84#issuecomment-482986850, or mute the thread < https://github.com/notifications/unsubscribe-auth/AMJVQSfC1koPfO-dFCWoPctKiY8ZPc91ks5vgznzgaJpZM4cupEY
.
-- Kate Stone PhD candidate Vasishth Lab | Department of Linguistics Potsdam University, 14467 Potsdam, Germany https://auskate.github.io
— You are receiving this because you commented. Reply to this email directly, view it on GitHub https://github.com/bnicenboim/eeguana/pull/84#issuecomment-482988075, or mute the thread https://github.com/notifications/unsubscribe-auth/AFtIelNIC49R4Hb0MfsPXIaXzZo-XiYXks5vgzuUgaJpZM4cupEY .
stonekate
commented
5 years ago yep!
On Sun, Apr 14, 2019 at 4:34 PM Bruno Nicenboim notifications@github.com wrote:
did you pull experimental?
On Sun, Apr 14, 2019, 16:30 auskate notifications@github.com wrote:
yeah but usually it says it can be done automatically, i.e. you don't have to do (much) extra work :)
Not this time!
On Sun, Apr 14, 2019 at 4:23 PM Bruno Nicenboim < notifications@github.com> wrote:
sorry, only I can merge!
On Sun, Apr 14, 2019, 16:21 auskate notifications@github.com wrote:
I don't know why it won't merge, sorry :( It won't let me resolve conflicts either. I tried to do it from the commande line but it says it's already up to date.
— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub < https://github.com/bnicenboim/eeguana/pull/84#issuecomment-482986417 , or mute the thread <
.
— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub <https://github.com/bnicenboim/eeguana/pull/84#issuecomment-482986850 , or mute the thread <
.
-- Kate Stone PhD candidate Vasishth Lab | Department of Linguistics Potsdam University, 14467 Potsdam, Germany https://auskate.github.io
— You are receiving this because you commented. Reply to this email directly, view it on GitHub https://github.com/bnicenboim/eeguana/pull/84#issuecomment-482988075, or mute the thread < https://github.com/notifications/unsubscribe-auth/AFtIelNIC49R4Hb0MfsPXIaXzZo-XiYXks5vgzuUgaJpZM4cupEY
.
— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub https://github.com/bnicenboim/eeguana/pull/84#issuecomment-482988724, or mute the thread https://github.com/notifications/unsubscribe-auth/AMJVQThBc1wwIswGMmfCrBdSIj0n8MGOks5vgzxwgaJpZM4cupEY .
-- Kate Stone PhD candidate Vasishth Lab | Department of Linguistics Potsdam University, 14467 Potsdam, Germany https://auskate.github.io
bnicenboim
commented
5 years ago ok I'll deal with it. don't worry
On Sun, Apr 14, 2019, 16:35 auskate notifications@github.com wrote:
yep!
On Sun, Apr 14, 2019 at 4:34 PM Bruno Nicenboim notifications@github.com wrote:
did you pull experimental?
On Sun, Apr 14, 2019, 16:30 auskate notifications@github.com wrote:
yeah but usually it says it can be done automatically, i.e. you don't have to do (much) extra work :)
Not this time!
On Sun, Apr 14, 2019 at 4:23 PM Bruno Nicenboim < notifications@github.com> wrote:
sorry, only I can merge!
On Sun, Apr 14, 2019, 16:21 auskate notifications@github.com wrote:
I don't know why it won't merge, sorry :( It won't let me resolve conflicts either. I tried to do it from the commande line but it says it's already up to date.
— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub < https://github.com/bnicenboim/eeguana/pull/84#issuecomment-482986417 , or mute the thread <
.
— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub < https://github.com/bnicenboim/eeguana/pull/84#issuecomment-482986850 , or mute the thread <
.
-- Kate Stone PhD candidate Vasishth Lab | Department of Linguistics Potsdam University, 14467 Potsdam, Germany https://auskate.github.io
— You are receiving this because you commented. Reply to this email directly, view it on GitHub <https://github.com/bnicenboim/eeguana/pull/84#issuecomment-482988075 , or mute the thread <
.
— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub https://github.com/bnicenboim/eeguana/pull/84#issuecomment-482988724, or mute the thread < https://github.com/notifications/unsubscribe-auth/AMJVQThBc1wwIswGMmfCrBdSIj0n8MGOks5vgzxwgaJpZM4cupEY
.
-- Kate Stone PhD candidate Vasishth Lab | Department of Linguistics Potsdam University, 14467 Potsdam, Germany https://auskate.github.io
— You are receiving this because you commented. Reply to this email directly, view it on GitHub https://github.com/bnicenboim/eeguana/pull/84#issuecomment-482988876, or mute the thread https://github.com/notifications/unsubscribe-auth/AFtIehBjP9jQkXOTsbLV_02unk5nlEVJks5vgzyjgaJpZM4cupEY .
I just moved the text I had written here & modified to make it fit. I haven't added examples as I didn't think it was necessary... but I can if you want. Maybe something like the code that's used in the tests.