On 3/8/13, Max Horn <max@xxxxxxxxx> wrote: > Same result, it works fine. Just shooting in the dark here... I wonder if there's some background process running in OS X that's messing with the files/directories while rebase is working... backup, virus scan, etc? Or maybe some programs that you're using at the same time? Maybe also make sure you don't have any programs (shells, editors, etc.) opened that's accessing those files/directories? Does the error always happen at COMMIT A and COMMIT B? Or is it all over the place? In cases where COMMIT A succeeded, did it say it did a 3-way merge? Or was it exactly as the output in your original message? i.e. no message at all -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html