Need to undo a file merge between two Windows 7 computers

I have two Windows 7 computers. For the sake of this question we will call them Boss's PC and Mary's PC. Right now the Boss's PC is the fast of the two computers. The Boss wants Mary to have his computer because she does more work and would benefit from having the faster computer. We were tasked with doing the data transfers. We mistakenly merged the profile on the Boss's computer with the profile on Mary's computer, not knowing that the profile on both computers had the same name, so it ended up merging the boss's data with Mary's data. Is there any way of reversing this merge? Otherwise we have to go thru the profiles on each computer and delete the data that was merged from the boss to Mary's computer, file by file.
thanks in advance.
RSchiererAsked:
Who is Participating?

[Product update] Infrastructure Analysis Tool is now available with Business Accounts.Learn More

x
I wear a lot of hats...

"The solutions and answers provided on Experts Exchange have been extremely helpful to me over the last few years. I wear a lot of hats - Developer, Database Administrator, Help Desk, etc., so I know a lot of things but not a lot about one thing. Experts Exchange gives me answers from people who do know a lot about one thing, in a easy to use platform." -Todd S.

Michael-BestCommented:
Use system restore to go back to a point that is good.

http://windows.microsoft.com/en-us/windows7/restore-system-files-and-settings
RSchiererAuthor Commented:
thanks but system restore does not restore the documents files and everything that is included under the profile name.
Michael-BestCommented:
Make a back up of all data then use system restore.
You will need to replace the data in the appropriate folders.

Sounds like a messy situation?
Try cloning or HDD  backup software before you risk deletion of important data.

One product that I recommend is:  
http://www.todo-backup.com/
IT Pros Agree: AI and Machine Learning Key

We’d all like to think our company’s data is well protected, but when you ask IT professionals they admit the data probably is not as safe as it could be.

rindiCommented:
Just delete the profiles, create new ones, then restore the data from your backups.

Anyway, why don't you store the data centrally on a server or a NAS? Then you wouldn't have to worry about who uses which PC, and you would only have to backup the server/NAS, and not all the PC's separately.
NVITEnd-user supportCommented:
Maybe this will help...
- At computer1, either make a share , or attach that drive to computer2
- At computer2, make a new admin profile. Logon that admin
- Install WinMerge http://winmerge.org or similar program.
- Run winmerge to compare affected folder trees

Experts Exchange Solution brought to you by

Your issues matter to us.

Facing a tech roadblock? Get the help and guidance you need from experienced professionals who care. Ask your question anytime, anywhere, with no hassle.

Start your 7-day free trial
RSchiererAuthor Commented:
I live/work in an area where 90% of our clients are companies that do not have servers. At best they have a PC running Win7 and is designated as the 'server' and run peer-to-peer. They do not normally backup their data or use a lot of technology. Considering I come from Long Island where every PC/server had a UPS and there was a wide range of technologies used to prevent data loss and virus and security software were the norm, and not the exception, it is very difficult to get acclimated to the lack of use of current technology. So knowing this, there are no backups, we don't image we don't image everyone computer that comes in for service. But NVIT's response is most like the best choice for this situation. Thanks to all for their responses.
rindiCommented:
What happens when data is lost? Backups are the most important thing to do with IT. If no backups are done, Computers shouldn't be used at all and the people should do everything with pen and paper. Teach your clients to backup!
It's more than this solution.Get answers and train to solve all your tech problems - anytime, anywhere.Try it for free Edge Out The Competitionfor your dream job with proven skills and certifications.Get started today Stand Outas the employee with proven skills.Start learning today for free Move Your Career Forwardwith certification training in the latest technologies.Start your trial today
Windows 7

From novice to tech pro — start learning today.