Hi All,
I have been using Tortoise SVN for a project on my personal computer as I do not have acces to a network drive from where I am working. Another developer has joined so I decided it would be best to create a branch on my local computer for his development work. The branch was then copied across to his computer via USB HDD. He has made changes and then I copy back in his changes into his branch folder on my local computer. This overwrites all the files in the branch and I then commit them using the SVN commit command. This I believe is working fairly well although I am now struggling to get the branch back into the trunk. As can be seen from the version history we have both been making changes in parallel. How do I get our two working copies merged and synced and back into the trunk?
I think I must be missing something as when I merge from my working copy to his or from his to mine the merge doesnt seem to work correctly (Missing changes from one developer or the other)
Can someone please point me in the right direction.
Many Thanks
Craig
