Extra file in GHC repo

[Matthew Pickering]

Yes, that is correct.

On Fri, May 13, 2022 at 2:14 PM Simon Peyton Jones
<simon.peytonjones at gmail.com> wrote:
>
> OK so I should delete the file -- and then the error should not re-occur, correct?
>
> thanks
>
> Simon
>
> On Fri, 13 May 2022 at 13:37, Matthew Pickering <matthewtpickering at gmail.com> wrote:
>>
>> The docs/index.html used to be generated by configure (and now it's
>> not). So you get this error when you have a dirty tree and try to
>> checkout a newer commit where the generated version will get
>> overwritten by the new non-generated version.
>>
>> Matt
>>
>> On Fri, May 13, 2022 at 11:46 AM Simon Peyton Jones
>> <simon.peytonjones at gmail.com> wrote:
>> >
>> > Hi devs
>> >
>> > I've started to get this a lot
>> >
>> > bash$ git rebase origin/master
>> > First, rewinding head to replay your work on top of it...
>> > error: The following untracked working tree files would be overwritten by checkout:
>> > docs/index.html
>> > Please move or remove them before you switch branches.
>> > Aborting
>> > fatal: Could not detach HEAD
>> >
>> > Removing docs/index.html makes things work again.  What am I doing wrong?
>> >
>> > Simon
>> > _______________________________________________
>> > ghc-devs mailing list
>> > ghc-devs at haskell.org
>> > http://mail.haskell.org/cgi-bin/mailman/listinfo/ghc-devs