Liquid Fire Posted October 28, 2007 Share Posted October 28, 2007 I know this is little OT but maybe someone can help me. We basically have svn for a new site we are developing. We have a development server were we just edit the files on the server and then the live version just pulls from the svn. We finally got a development branch in the svn and are going to use that to the the staging site to pull from. The issue i am having right now is that the development files are not synced with the trunk, there are changes in both that are not in the other. i have tortoise svn svn installed and what to know if there is a way to merge the trunk and development branch locally and deal with the conflicts on my local machine only, not on the really svn server? Quote Link to comment Share on other sites More sharing options...
Recommended Posts
Join the conversation
You can post now and register later. If you have an account, sign in now to post with your account.