I did make changes. 'git reset --hard' worked. Thanks.<br><br><div class="gmail_quote">On Tue, Jun 21, 2011 at 6:11 PM, curriegrad2004 <span dir="ltr"><<a href="mailto:curriegrad2004@gmail.com">curriegrad2004@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">did you make any changes to the code tree? If you did, you'd probably<br>
want to perform a git stash to save all the changes you made then run<br>
git stash apply to merge your changes after the pull.<br>
<br>
Otherwise, it would be wise to run git reset --hard to 'fix' the<br>
source tree if you are sure you made no changes to the code at all<br>
<div><div></div><div class="h5"><br>
On Tue, Jun 21, 2011 at 5:44 PM, elijah <<a href="mailto:elijah@crankenstein.com">elijah@crankenstein.com</a>> wrote:<br>
> My attempts to 'make current' against the Git repository are failing today.<br>
> Can you recommend a method by which I can update my FreeSwitch installation?<br>
> Here's the the last bit of console logging:<br>
> ...<br>
> make[2]: Leaving directory `/usr/src/freeswitch/libs/esl/ruby'<br>
> make -C java clean<br>
> make[2]: Entering directory `/usr/src/freeswitch/libs/esl/java'<br>
> rm -f *.o *.so *~ *.jar<br>
> make[2]: Leaving directory `/usr/src/freeswitch/libs/esl/java'<br>
> make -C managed clean<br>
> make[2]: Entering directory `/usr/src/freeswitch/libs/esl/managed'<br>
> rm -f *.o *.so *~<br>
> make[2]: Leaving directory `/usr/src/freeswitch/libs/esl/managed'<br>
> make[1]: Leaving directory `/usr/src/freeswitch/libs/esl'<br>
> make update<br>
> make[1]: Entering directory `/usr/src/freeswitch'<br>
> Pulling updates...<br>
> Updating 5923f71..4bb7683<br>
> src/mod/applications/mod_dptools/mod_dptools.c: needs update<br>
> fatal: Entry 'src/mod/applications/mod_dptools/mod_dptools.c' not uptodate.<br>
> Cannot merge.<br>
> make[1]: *** [update] Error 128<br>
> make[1]: Leaving directory `/usr/src/freeswitch'<br>
> make: *** [current] Error 2<br>
><br>
</div></div>> _______________________________________________<br>
> Join us at ClueCon 2011, Aug 9-11, Chicago<br>
> <a href="http://www.cluecon.com" target="_blank">http://www.cluecon.com</a> 877-7-4ACLUE<br>
><br>
> FreeSWITCH-users mailing list<br>
> <a href="mailto:FreeSWITCH-users@lists.freeswitch.org">FreeSWITCH-users@lists.freeswitch.org</a><br>
> <a href="http://lists.freeswitch.org/mailman/listinfo/freeswitch-users" target="_blank">http://lists.freeswitch.org/mailman/listinfo/freeswitch-users</a><br>
> UNSUBSCRIBE:<a href="http://lists.freeswitch.org/mailman/options/freeswitch-users" target="_blank">http://lists.freeswitch.org/mailman/options/freeswitch-users</a><br>
> <a href="http://www.freeswitch.org" target="_blank">http://www.freeswitch.org</a><br>
><br>
><br>
<br>
_______________________________________________<br>
Join us at ClueCon 2011, Aug 9-11, Chicago<br>
<a href="http://www.cluecon.com" target="_blank">http://www.cluecon.com</a> 877-7-4ACLUE<br>
<br>
FreeSWITCH-users mailing list<br>
<a href="mailto:FreeSWITCH-users@lists.freeswitch.org">FreeSWITCH-users@lists.freeswitch.org</a><br>
<a href="http://lists.freeswitch.org/mailman/listinfo/freeswitch-users" target="_blank">http://lists.freeswitch.org/mailman/listinfo/freeswitch-users</a><br>
UNSUBSCRIBE:<a href="http://lists.freeswitch.org/mailman/options/freeswitch-users" target="_blank">http://lists.freeswitch.org/mailman/options/freeswitch-users</a><br>
<a href="http://www.freeswitch.org" target="_blank">http://www.freeswitch.org</a><br>
</blockquote></div><br>