Re: git is complaining
Alexander Hansen <[email protected]>
| Newsgroups | gmane.os.apple.fink.beginners |
|---|---|
| Message-ID | <[email protected]> |
In general with git I’ve only gotten that kind of error when I’ve made a local modification. The workaround Is pretty straightforward (“Fink tree” is the root of your Fink tree, e.g. /sw or /opt/sw): - cd <Fink tree>/fink - git stash You might also use “git diff” to verify if you do in fact have local changes you might want to keep. If you do, then I’d recommend copying the files to <Fink tree>/dists/local/main/finkinfo --akh Sent from Mail for Windows 10 From: Chris Schram via Fink-beginners Sent: Sunday, November 15, 2020 9:47 PM To: [email protected] Subject: [Fink-beginners] git is complaining 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 _______________________________________________ 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