Re: git to p4 conversion

> Hi,
>
> Thanks for your patience and the detailed help.
> I forgot only one thing, that I need two separate directories... :)
>
> So, after some minor mods in git-p4 (I have some directories with
> spaces, and some files with #@*% in their names), it seems as if it
> worked, my files are in P4 depot, although I got an error message:
>
> Failed to merge in the changes.
> Patch failed at 0001 Initial commit
>
> 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".
>
> Exception: command failed: git rebase remotes/p4/master