"git checkout -- libs/spandsp/INSTALL" - before make current /Peter -----Ursprungligt meddelande----- Från: freeswitch-users-bounces@lists.freeswitch.org [mailto:freeswitch-users-bounces@lists.freeswitch.org] För Evgeniy Movlyan Skickat: den 14 augusti 2012 10:30 Till: freeswitch-users@lists.freeswitch.org Ämne: [Freeswitch-users] Error while make current Hi to all. I tried to update my FS, but got this message: make[1]: Entering directory `/usr/local/src/freeswitch' Pulling updates... remote: Counting objects: 335, done. remote: Compressing objects: 100% (95/95), done. remote: Total 244 (delta 192), reused 187 (delta 148) Receiving objects: 100% (244/244), 109.48 KiB | 175 KiB/s, done. Resolving deltas: 100% (192/192), completed with 62 local objects. From git://git.freeswitch.org/freeswitch aad07c6..3d9d42b master -> origin/master 9732411..f2f4f4a v1.2.stable -> origin/v1.2.stable Updating 9ac586a..3d9d42b error: Your local changes to 'libs/spandsp/INSTALL' would be overwritten by merge. Aborting. Please, commit your changes or stash them before you can merge. make[1]: *** [update] Error 1 make[1]: Leaving directory `/usr/local/src/freeswitch' make: *** [current] Error 2 -- Evgeniy Movlyan, BestNet Ltd. _________________________________________________________________________ Professional FreeSWITCH Consulting Services: consulting@freeswitch.org http://www.freeswitchsolutions.com FreeSWITCH-powered IP PBX: The CudaTel Communication Server http://www.cudatel.com Official FreeSWITCH Sites http://www.freeswitch.org http://wiki.freeswitch.org http://www.cluecon.com Join Us At ClueCon - Aug 7-9, 2012 FreeSWITCH-users mailing list FreeSWITCH-users@lists.freeswitch.org http://lists.freeswitch.org/mailman/listinfo/freeswitch-users UNSUBSCRIBE:http://lists.freeswitch.org/mailman/options/freeswitch-users http://www.freeswitch.org !DSPAM:502a0a7d32761616232089!