From: Lucas Carlson Date: Tue, 19 Aug 2008 22:23:42 GMT Subject: git merge bus error Message-ID: /usr/local/bin/git-merge: line 438: 19000 Bus error git- merge-$strategy $common -- "$head_arg" "$@" I have tried every merge strategy there is. It ends up leaving a .git/ index.lock file. I used git 1.5.6 and tried upgrading to 1.6.0. The only thing 1.6.0 did was hide this bus error message but I assume it still bus errors because there is a .git/index.lock file still. Unfortunately the source code is proprietary so I can not let you try it on your own but let me know what I can run on my machine to help you guys track down this bus error. -Lucas http://rufy.com/