Transfer user files to new computer without creating new user?

Question

I know this is probably listed on here, but I have searched for two days and have not found it. I am very confused and frusterated. I set up my new iMac on wednesday running Lion. When I originally tried migration in setup assistant, the only way to migrate computer to computer was over the wifi. After that failed/froze three times (I am thinking because my home internet is too slow?) I just skipped that set in setup so I could use my computer. After reading some posts, I saw that I could migrate by essentailly making my old computer (macbook pro) an external hard drive and holding down the "T" key when I restarted. When it said I cannot transfer that user with the same name to the new computer, I changed the name.  That worked must faster and transfered all my stuff over. I went to set up my itunes and iphoto and noticed that I couldn't find those migrated files. I read another post saying that i now have another user and have to log out and log into that user to get the files. I don't want two users, I want one that has all my stuff! Now maybe I did something wrong or don't totally understand the process, but is there a way for that to be done?? I have read I can delete the "admin" account that my computer created somehow and just use the old computers migrated user as my main account or just leave them both. Which is the better option here? Appreciate any help anyone can give. Thank you for your time.

Answer 1

You did nothing wrong, but you did misunderstand the process. Here are your options:
Log out of the account you created in Setup Assistant and log into the account you migrated from your old computer. Open Accounts preferences, click on the lock icon and enter the admin password for the migrated account. Select the account created in Setup Assistant and click on the Delete [-] button to remove it. Select the third removal option. You now have one user account - the renamed account you migrated from your old computer.
Create a third temporary account. Name it "temp" and use "temp" as the password (no quotes.) Give this new account admin status. Log out of the current account and log into temp. Now delete both of the other accounts. Then connect the other computer via Firewire cable as you did before. Boot the old computer into Target Disk Mode. Now re-migrate your old account using Migration Assistant. After the migration has completed log out of temp and log into your old account. Delete the temp account. This will give you one account with the same username you were using originally.