Urgent Help Needed - Migration Assistant - Two accounts into one?

[arcsbite]

I just got my Blackbook and I am wanting to migrate everything from my iMac before it gets picked up this afternoon.

I tried migration assistant and it took 2 hours.
it copied everything fine, but it created another account, so now I have 2 accounts.

the problem is, the main macbook account has the long and short name "MacBook"
where as the iMac migration account it called "iMac Core Duo" and "iMac" as it's shortname.
I need the stuff migrated from "iMac" to be conbined with "MacBook"
or I need to delete the "MacBook" account and rename the "iMac" to "MacBook" including it's shortname...

..I don't know how to either, and I only have about 4 more hours to get this done. can someone Please advise?

thank you so much

 

[reh]

Log in as the new user on your MacBook and copy all of the files into the /Users/Shared folder. Then log in as your original user on the MacBook and grab those files from the Shared folder. Provided you're satisfied that all files are present and accounted for, go ahead and delete the new user.