BTW this could happen with other developers.

The reason this happened with me is that I use the csound repository
as a submodule in the csound-extended repository. My build script does
a pull from the csound repository. That failed with a merge conflict
so I tried to merge preferring always the csound head. That failed
because I also merged .gitignore.

Regards,
Mike

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

On Fri, Jun 15, 2018 at 8:18 AM Michael Gogins  wrote:
>
> 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

maybe we should close the access to all but a small number of devs and operate solely on pull requests

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

> On 15 Jun 2018, at 13:21, Michael Gogins  wrote:
> 
> BTW this could happen with other developers.
> 
> The reason this happened with me is that I use the csound repository
> as a submodule in the csound-extended repository. My build script does
> a pull from the csound repository. That failed with a merge conflict
> so I tried to merge preferring always the csound head. That failed
> because I also merged .gitignore.
> 
> Regards,
> Mike
> 
> -----------------------------------------------------
> Michael Gogins
> Irreducible Productions
> http://michaelgogins.tumblr.com
> Michael dot Gogins at gmail dot com
> 
>> On Fri, Jun 15, 2018 at 8:18 AM Michael Gogins  wrote:
>> 
>> 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

I am running the filter now. Pull requests would be the most secure
option, but another is to require developers to rebase. This was my
mistake -- to merge rather than rebase.

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

On Fri, Jun 15, 2018 at 8:23 AM Victor Lazzarini  wrote:
>
> maybe we should close the access to all but a small number of devs and operate solely on pull requests
>
> Victor Lazzarini
> Dean of Arts, Celtic Studies, and Philosophy
> Maynooth University
> Ireland
>
> > On 15 Jun 2018, at 13:21, Michael Gogins  wrote:
> >
> > BTW this could happen with other developers.
> >
> > The reason this happened with me is that I use the csound repository
> > as a submodule in the csound-extended repository. My build script does
> > a pull from the csound repository. That failed with a merge conflict
> > so I tried to merge preferring always the csound head. That failed
> > because I also merged .gitignore.
> >
> > Regards,
> > Mike
> >
> > -----------------------------------------------------
> > Michael Gogins
> > Irreducible Productions
> > http://michaelgogins.tumblr.com
> > Michael dot Gogins at gmail dot com
> >
> >> On Fri, Jun 15, 2018 at 8:18 AM Michael Gogins  wrote:
> >>
> >> 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

This is done now. Looks OK to me, check it yourself.

Regards,
Mike

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

On Fri, Jun 15, 2018 at 8:31 AM Michael Gogins  wrote:
>
> I am running the filter now. Pull requests would be the most secure
> option, but another is to require developers to rebase. This was my
> mistake -- to merge rather than rebase.
>
> -----------------------------------------------------
> Michael Gogins
> Irreducible Productions
> http://michaelgogins.tumblr.com
> Michael dot Gogins at gmail dot com
>
> On Fri, Jun 15, 2018 at 8:23 AM Victor Lazzarini  wrote:
> >
> > maybe we should close the access to all but a small number of devs and operate solely on pull requests
> >
> > Victor Lazzarini
> > Dean of Arts, Celtic Studies, and Philosophy
> > Maynooth University
> > Ireland
> >
> > > On 15 Jun 2018, at 13:21, Michael Gogins  wrote:
> > >
> > > BTW this could happen with other developers.
> > >
> > > The reason this happened with me is that I use the csound repository
> > > as a submodule in the csound-extended repository. My build script does
> > > a pull from the csound repository. That failed with a merge conflict
> > > so I tried to merge preferring always the csound head. That failed
> > > because I also merged .gitignore.
> > >
> > > Regards,
> > > Mike
> > >
> > > -----------------------------------------------------
> > > Michael Gogins
> > > Irreducible Productions
> > > http://michaelgogins.tumblr.com
> > > Michael dot Gogins at gmail dot com
> > >
> > >> On Fri, Jun 15, 2018 at 8:18 AM Michael Gogins  wrote:
> > >>
> > >> 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