A friend of mine asked me for help with a git rebase problem. I was clueless. Here is what he was seeing: The main problem seems to be the following error: "fatal: Untracked working tree file '.dotest/0001' would be overwritten by merge."; also all the files that it says "already exist in working directory" did not exist before he ran the rebase. Maybe it's trying to run the rebase more than once? His working copy was clean. Any thoughts? Any other details I can provide? Thanks! Joe git rebase master First, rewinding head to replay your work on top of it... HEAD is now at 9bba5f1... Create function snippet Applying People page templates .dotest/patch:59: trailing whitespace. .dotest/patch:60: space before tab in indent. parent::BuildControlArray($EventParameters); .dotest/patch:61: space before tab in indent. } .dotest/patch:65: trailing whitespace, space before tab in indent. .dotest/patch:67: trailing whitespace. error: .dotest/0001: already exists in working directory error: .dotest/0002: already exists in working directory error: .dotest/0003: already exists in working directory error: .dotest/binary: already exists in working directory error: .dotest/final-commit: already exists in working directory error: .dotest/info: already exists in working directory error: .dotest/keep: already exists in working directory error: .dotest/last: already exists in working directory error: .dotest/msg: already exists in working directory error: .dotest/msg-clean: already exists in working directory error: .dotest/next: already exists in working directory error: .dotest/patch: already exists in working directory error: .dotest/sign: already exists in working directory error: .dotest/utf8: already exists in working directory error: .dotest/whitespace: already exists in working directory Using index info to reconstruct a base tree... stdin:59: trailing whitespace. stdin:60: space before tab in indent. parent::BuildControlArray($EventParameters); stdin:61: space before tab in indent. } stdin:65: trailing whitespace, space before tab in indent. stdin:67: trailing whitespace. warning: squelched 49 whitespace errors warning: 54 lines add whitespace errors. Falling back to patching base and 3-way merge... fatal: Untracked working tree file '.dotest/0001' would be overwritten by merge. Failed to merge in the changes. Patch failed at 0001. When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". -- joe fiorini http://www.faithfulgeek.org // freelancing & knowledge sharing -- 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
