My attempts to &#39;make current&#39; against the Git repository are failing today. Can you recommend a method by which I can update my FreeSwitch installation? Here&#39;s the the last bit of console logging:<div><br></div>

<div>...</div><div><div>make[2]: Leaving directory `/usr/src/freeswitch/libs/esl/ruby&#39;</div><div>make -C java clean</div><div>make[2]: Entering directory `/usr/src/freeswitch/libs/esl/java&#39;</div><div>rm -f *.o *.so *~ *.jar</div>

<div>make[2]: Leaving directory `/usr/src/freeswitch/libs/esl/java&#39;</div><div>make -C managed clean</div><div>make[2]: Entering directory `/usr/src/freeswitch/libs/esl/managed&#39;</div><div>rm -f *.o *.so *~</div><div>

make[2]: Leaving directory `/usr/src/freeswitch/libs/esl/managed&#39;</div><div>make[1]: Leaving directory `/usr/src/freeswitch/libs/esl&#39;</div><div>make update</div><div>make[1]: Entering directory `/usr/src/freeswitch&#39;</div>

<div>Pulling updates...</div><div>Updating 5923f71..4bb7683</div><div>src/mod/applications/mod_dptools/mod_dptools.c: needs update</div><div>fatal: Entry &#39;src/mod/applications/mod_dptools/mod_dptools.c&#39; not uptodate. Cannot merge.</div>

<div>make[1]: *** [update] Error 128</div><div>make[1]: Leaving directory `/usr/src/freeswitch&#39;</div><div>make: *** [current] Error 2</div></div><div><br></div>