On 2020.02.14 12:05, Albrecht Dreß wrote:
Hi all,
trying tu run “git pull” for master ejects with an error:
<snip>
albrecht@deneb:~/Balsa/git/balsa-master$ LANG=C git pull
error: The following untracked working tree files would be
overwritten by merge:
config.guess
config.sub
m4/libtool.m4
Please move or remove them before you merge.
Aborting
</snip>
These files are typically created by running autogen.sh, 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 <d...@fifthhorseman.net>
Date: Thu Feb 13 15:36:00 2020 -0500
Use https when referring to www.gnu.org
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.
Jack
_______________________________________________
balsa-list mailing list
balsa-list@gnome.org
https://mail.gnome.org/mailman/listinfo/balsa-list
