Again in a repository I haven't done anything in except `git pull' and non-destructive commands:
% git pull remote: Counting objects: 2975, done. remote: Compressing objects: 100% (110/110), done. remote: Total 1585 (delta 1479), reused 1574 (delta 1472) Receiving objects: 100% (1585/1585), 465.96 KiB, done. Resolving deltas: 100% (1479/1479), completed with 1331 local objects. >From /Users/riastradh/programming/scheme/mit/git/clean 84dc9f9..8acc2b0 master -> origin/master Updating 84dc9f9..8acc2b0 error: Entry 'src/edwin/basic.scm' not uptodate. Cannot merge. In another repository, in which I have some local changes and have run some destructive commands (e.g., `git add', `git commit', `git push', &c.), I encountered a similar problem: % git pull remote: Counting objects: 2970, done. remote: Compressing objects: 100% (103/103), done. remote: Total 1578 (delta 1474), reused 1574 (delta 1472) Receiving objects: 100% (1578/1578), 465.38 KiB, done. Resolving deltas: 100% (1474/1474), completed with 1328 local objects. >From ssh://git.sv.gnu.org/srv/git/mit-scheme a996c47..8acc2b0 master -> origin/master Updating 944e600..8acc2b0 error: Entry 'src/microcode/bkpt.h' not uptodate. Cannot merge. What can I do? _______________________________________________ MIT-Scheme-devel mailing list [email protected] http://lists.gnu.org/mailman/listinfo/mit-scheme-devel
