Jump to content
  • Advertisement
Sign in to follow this  
CDProp

How to merge separate files with SVN?

This topic is 2849 days old which is more than the 365 day threshold we allow for new replies. Please post a new topic.

If you intended to correct an error in the post then please contact us.

Recommended Posts

Hello,

Somewhat of a weird situation. I have two source files on my machine. They're not source-controlled. They were once identical to one another, but each copy has had changes made to them. I'd like to merge these changes into one document. Is there any way to get SVN to do this for me? I'm using a Windows 7 machine with TortoiseSVN.

Share this post


Link to post
Share on other sites
Advertisement
Sign in to follow this  

  • Advertisement
×

Important Information

By using GameDev.net, you agree to our community Guidelines, Terms of Use, and Privacy Policy.

We are the game development community.

Whether you are an indie, hobbyist, AAA developer, or just trying to learn, GameDev.net is the place for you to learn, share, and connect with the games industry. Learn more About Us or sign up!

Sign me up!