git pull error w/ master
Albrecht Dreß <[email protected]> Fri, 14 Feb 2020 18:05:53 +0100
| Newsgroups | gmane.comp.gnome.apps.balsa |
|---|---|
| Message-ID | <[email protected]> |
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?
Best,
Albrecht.
_______________________________________________
balsa-list mailing list
[email protected]
https://mail.gnome.org/mailman/listinfo/balsa-list
signature.asc
(application/pgp-signature, 488 B)
-----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEcCEPemLFTtyGf4zATKlvDmfn2fgFAl5G03EACgkQTKlvDmfn 2fgOKwgApMIIPaov4j+WYan1Qmq0MgPsV1EK+wMJE7FIHWtr8xCX7MmM5h5ssi9m oVirVXoPPafWXTx1mG2WTz7hMUhezHlvrMYka2do769EADNkNC/fbkx3HwLZArLa MUqTApKJWBKQOqLUdhkQadGkH8Mjq5xuWW5TeVR8epcCAxusLOIX40/5H9HMIBRW ZKVWgXwvJucSfsySV5YUT4uvySCi7qXJYZg57pequJCOJLOK8EzCV1xCs+3uWpDW o3c5QCjIY8W2fl1sXJIbXJvnML2ST2TBh6jf3gUR+HcBOdRWdg2MgdA3/CpS8r3x ksZ7uiBdmlBUNjkAXihxSK64qpZYfw== =ruFL -----END PGP SIGNATURE-----