Here’s an excellent post on resolving this type of conflict: http://triopter.com/archive/resolving-local-delete-incoming-delete-upon-update-subversion-tree-conflicts/
Android Hobbyist
In one of my recent academic projects, I worked on the Android SDK and was hooked. I’m currently experimenting with layouts and basic applications using an Android emulator. The first Android application we built was a mobile transit application for the Port Authority of Allegheny County.
View the app details
3D modeler
In my spare time I like to dabble with 3Ds max and, of late, Blender- a free open source 3D content creation suite, available for all major operating systems under the GNU General Public License.
Blender has come a long way since its inception and with it awesome and helpful community it has the promise of a professional package.
Check out Blender!
Amateur Logician
As an inevitable consequence of eight years of pedagogy, and specifically, the principles of argumentation theory and critical reasoning, I am interested in investigating the principles of classical inductive and deductive logic and their applications in decision making.
Download document
