Commit 4935c78427ad8af06576d102edbc9e60015e90dd  has reintroduced cs4vst code that
was removed from tree and history

commit 4935c78427ad8af06576d102edbc9e60015e90dd (origin/develop, origin/HEAD)
Merge: 7c3239ee2 4a6a1d816
Author: Michael Gogins 
Date:   Fri Jun 15 07:56:07 2018 -0400

    Merging in favor of theirs all the way.

Can this please be reverted? Otherwise we will be in trouble.


========================
Prof. Victor Lazzarini
Dean of Arts, Celtic Studies, and Philosophy,
Maynooth University,
Maynooth, Co Kildare, Ireland
Tel: 00 353 7086936

I will revert it. Sorry about that. I assumed that having the dir in
.gitignore would prevent this but I see that .gitignore itself was in
the merge!

Regards,
Mike

-----------------------------------------------------
Michael Gogins
Irreducible Productions
http://michaelgogins.tumblr.com
Michael dot Gogins at gmail dot com

On Fri, Jun 15, 2018 at 8:02 AM Victor Lazzarini  wrote:
>
> Commit 4935c78427ad8af06576d102edbc9e60015e90dd  has reintroduced cs4vst code that
> was removed from tree and history
>
> commit 4935c78427ad8af06576d102edbc9e60015e90dd (origin/develop, origin/HEAD)
> Merge: 7c3239ee2 4a6a1d816
> Author: Michael Gogins 
> Date:   Fri Jun 15 07:56:07 2018 -0400
>
>     Merging in favor of theirs all the way.
>
> Can this please be reverted? Otherwise we will be in trouble.
>
>
> ========================
> Prof. Victor Lazzarini
> Dean of Arts, Celtic Studies, and Philosophy,
> Maynooth University,
> Maynooth, Co Kildare, Ireland
> Tel: 00 353 7086936

I reverted this but I still see vst4cs/src. Now what?

Regards,
Mike

-----------------------------------------------------
Michael Gogins
Irreducible Productions
http://michaelgogins.tumblr.com
Michael dot Gogins at gmail dot com

On Fri, Jun 15, 2018 at 8:05 AM Michael Gogins  wrote:
>
> I will revert it. Sorry about that. I assumed that having the dir in
> .gitignore would prevent this but I see that .gitignore itself was in
> the merge!
>
> Regards,
> Mike
>
> -----------------------------------------------------
> Michael Gogins
> Irreducible Productions
> http://michaelgogins.tumblr.com
> Michael dot Gogins at gmail dot com
>
> On Fri, Jun 15, 2018 at 8:02 AM Victor Lazzarini  wrote:
> >
> > Commit 4935c78427ad8af06576d102edbc9e60015e90dd  has reintroduced cs4vst code that
> > was removed from tree and history
> >
> > commit 4935c78427ad8af06576d102edbc9e60015e90dd (origin/develop, origin/HEAD)
> > Merge: 7c3239ee2 4a6a1d816
> > Author: Michael Gogins 
> > Date:   Fri Jun 15 07:56:07 2018 -0400
> >
> >     Merging in favor of theirs all the way.
> >
> > Can this please be reverted? Otherwise we will be in trouble.
> >
> >
> > ========================
> > Prof. Victor Lazzarini
> > Dean of Arts, Celtic Studies, and Philosophy,
> > Maynooth University,
> > Maynooth, Co Kildare, Ireland
> > Tel: 00 353 7086936

you might need to apply git filter-branch again as described in the github doc to
remove it from the branch and history

Victor Lazzarini
Dean of Arts, Celtic Studies, and Philosophy
Maynooth University
Ireland

> On 15 Jun 2018, at 13:14, Michael Gogins  wrote:
> 
> I reverted this but I still see vst4cs/src. Now what?
> 
> Regards,
> Mike
> 
> -----------------------------------------------------
> Michael Gogins
> Irreducible Productions
> http://michaelgogins.tumblr.com
> Michael dot Gogins at gmail dot com
> 
>> On Fri, Jun 15, 2018 at 8:05 AM Michael Gogins  wrote:
>> 
>> I will revert it. Sorry about that. I assumed that having the dir in
>> .gitignore would prevent this but I see that .gitignore itself was in
>> the merge!
>> 
>> Regards,
>> Mike
>> 
>> -----------------------------------------------------
>> Michael Gogins
>> Irreducible Productions
>> http://michaelgogins.tumblr.com
>> Michael dot Gogins at gmail dot com
>> 
>>> On Fri, Jun 15, 2018 at 8:02 AM Victor Lazzarini  wrote:
>>> 
>>> Commit 4935c78427ad8af06576d102edbc9e60015e90dd  has reintroduced cs4vst code that
>>> was removed from tree and history
>>> 
>>> commit 4935c78427ad8af06576d102edbc9e60015e90dd (origin/develop, origin/HEAD)
>>> Merge: 7c3239ee2 4a6a1d816
>>> Author: Michael Gogins 
>>> Date:   Fri Jun 15 07:56:07 2018 -0400
>>> 
>>>    Merging in favor of theirs all the way.
>>> 
>>> Can this please be reverted? Otherwise we will be in trouble.
>>> 
>>> 
>>> ========================
>>> Prof. Victor Lazzarini
>>> Dean of Arts, Celtic Studies, and Philosophy,
>>> Maynooth University,
>>> Maynooth, Co Kildare, Ireland
>>> Tel: 00 353 7086936

I'll do that.

Regards,
Mike

-----------------------------------------------------
Michael Gogins
Irreducible Productions
http://michaelgogins.tumblr.com
Michael dot Gogins at gmail dot com

On Fri, Jun 15, 2018 at 8:16 AM Victor Lazzarini  wrote:
>
> you might need to apply git filter-branch again as described in the github doc to
> remove it from the branch and history
>
> Victor Lazzarini
> Dean of Arts, Celtic Studies, and Philosophy
> Maynooth University
> Ireland
>
> > On 15 Jun 2018, at 13:14, Michael Gogins  wrote:
> >
> > I reverted this but I still see vst4cs/src. Now what?
> >
> > Regards,
> > Mike
> >
> > -----------------------------------------------------
> > Michael Gogins
> > Irreducible Productions
> > http://michaelgogins.tumblr.com
> > Michael dot Gogins at gmail dot com
> >
> >> On Fri, Jun 15, 2018 at 8:05 AM Michael Gogins  wrote:
> >>
> >> I will revert it. Sorry about that. I assumed that having the dir in
> >> .gitignore would prevent this but I see that .gitignore itself was in
> >> the merge!
> >>
> >> Regards,
> >> Mike
> >>
> >> -----------------------------------------------------
> >> Michael Gogins
> >> Irreducible Productions
> >> http://michaelgogins.tumblr.com
> >> Michael dot Gogins at gmail dot com
> >>
> >>> On Fri, Jun 15, 2018 at 8:02 AM Victor Lazzarini  wrote:
> >>>
> >>> Commit 4935c78427ad8af06576d102edbc9e60015e90dd  has reintroduced cs4vst code that
> >>> was removed from tree and history
> >>>
> >>> commit 4935c78427ad8af06576d102edbc9e60015e90dd (origin/develop, origin/HEAD)
> >>> Merge: 7c3239ee2 4a6a1d816
> >>> Author: Michael Gogins 
> >>> Date:   Fri Jun 15 07:56:07 2018 -0400
> >>>
> >>>    Merging in favor of theirs all the way.
> >>>
> >>> Can this please be reverted? Otherwise we will be in trouble.
> >>>
> >>>
> >>> ========================
> >>> Prof. Victor Lazzarini
> >>> Dean of Arts, Celtic Studies, and Philosophy,
> >>> Maynooth University,
> >>> Maynooth, Co Kildare, Ireland
> >>> Tel: 00 353 7086936