git is complaining
Chris Schram via Fink-beginners <[email protected]>
| Newsgroups | gmane.os.apple.fink.beginners |
|---|---|
| Organization | Where the hell is Langlois, Oregon? |
| Message-ID | <[email protected]> |
Package manager version: 0.45.2 Distribution version: selfupdate-git Fri Nov 13 19:00:10 2020, 10.14.5, x86_64 When I run fink selfupdate on our Mojave installation, I've started getting this complaint from git. I have not made any conscious local changes in ages. Can you give this bonehead step-by-step instructions to resolve this issue. Thanks I will now run the git command to retrieve the latest package descriptions. After that, the core packages will be updated right away; you should then update the other packages using commands like 'fink update-all'. /usr/bin/git fetch --quiet origin /usr/bin/git checkout --quiet master /usr/bin/git merge --ff-only --quiet origin/master error: Your local changes to the following files would be overwritten by merge: 10.9-libcxx/stable/main/finkinfo/languages/python36.info 10.9-libcxx/stable/main/finkinfo/languages/python37.info Please commit your changes or stash them before you merge. Aborting ### execution of /usr/bin/git failed, exit code 1 Failed: Updating using git failed. Check the error messages above. -- [email protected] is a filtered spam magnet. Email replies may be lost. You're better off replying to this newsgroup. _______________________________________________ Fink-beginners mailing list [email protected] List archive: https://sourceforge.net/p/fink/mailman/fink-users/ Subscription management: https://lists.sourceforge.net/lists/listinfo/fink-beginners