[Freeswitch-users] 'make current' fails to complete

[elijah]

My attempts to 'make current' against the Git repository are failing today.
Can you recommend a method by which I can update my FreeSwitch installation?
Here's the the last bit of console logging:

...
make[2]: Leaving directory `/usr/src/freeswitch/libs/esl/ruby'
make -C java clean
make[2]: Entering directory `/usr/src/freeswitch/libs/esl/java'
rm -f *.o *.so *~ *.jar
make[2]: Leaving directory `/usr/src/freeswitch/libs/esl/java'
make -C managed clean
make[2]: Entering directory `/usr/src/freeswitch/libs/esl/managed'
rm -f *.o *.so *~
make[2]: Leaving directory `/usr/src/freeswitch/libs/esl/managed'
make[1]: Leaving directory `/usr/src/freeswitch/libs/esl'
make update
make[1]: Entering directory `/usr/src/freeswitch'
Pulling updates...
Updating 5923f71..4bb7683
src/mod/applications/mod_dptools/mod_dptools.c: needs update
fatal: Entry 'src/mod/applications/mod_dptools/mod_dptools.c' not uptodate.
Cannot merge.
make[1]: *** [update] Error 128
make[1]: Leaving directory `/usr/src/freeswitch'
make: *** [current] Error 2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.freeswitch.org/pipermail/freeswitch-users/attachments/20110621/c639c78c/attachment.html