Here is what I get: 17:50 r...@olecarme /opt/gimp# git pull remote: Counting objects: 288, done. remote: Compressing objects: 100% (182/182), done. remote: Total 182 (delta 143), reused 0 (delta 0) Receiving objects: 100% (182/182), 36.59 KiB, done. Resolving deltas: 100% (143/143), completed with 64 local objects. >From git://git.gnome.org/gimp 1c91f68..552158a gimp-2-6 -> origin/gimp-2-6 bc72b15..ba3d530 master -> origin/master Updating bc72b15..ba3d530 error: Your local changes to 'm4macros/gtk-doc.m4' would be overwritten by merge. Aborting. Please, commit your changes or stash them before you can merge. zsh: exit 1 git pull
Is it a problem with me, or with the git site? -- Olivier Lecarme
_______________________________________________ Gimp-developer mailing list Gimp-developer@lists.XCF.Berkeley.EDU https://lists.XCF.Berkeley.EDU/mailman/listinfo/gimp-developer
