Re: git pull error w/ master

On 2020.02.14 12:05, Albrecht Dreß wrote:
Hi all,

trying tu run “git pull” for master ejects with an error:

albrecht@deneb:~/Balsa/git/balsa-master$ LANG=C git pull
error: The following untracked working tree files would be overwritten by merge:
Please move or remove them before you merge.

These files are typically created by running, and are usually not included in git. Or did I miss something?
Hello Albrecht,

I just tried a git pull and had no problems. I do notice, however, that all three files have commits from yesterday:

Author: Daniel Kahn Gillmor <dkg fifthhorseman net>
Date:   Thu Feb 13 15:36:00 2020 -0500
    Use https when referring to

It looks like that might be part of a larger effort to change http: to https: everywhere. I've seen the same sort of edit in lots of KDE repositories.

My guess would be to either delete them or do "git checkout -- filename" on each of them.
I may not have had them present, since I use meson instead of configure.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]