So today I was attempting my first merge using Subclipse and boy was that fun to figure out. Luckily I stumbled across this post:
which at the time was unavailable, so I used the google cache version found here:
The basic summary to the post is this: Since I was trying to merge the changes from my production code into my branch/development copy to have an updated copy to deploy on the development server, I needed to get a changeset from the production code – version I branched out – 1 (that part I still don’t understand, but it worked) to the head revision – and merge that with my working copy.
I chose to put it all in a new working copy with a new version that I plan to release as my new production copy – but however you do that is your own choice.
