Need Help - How to merge changes from different svn locations (1 Viewer)

Guzzi

Retired Team Member
  • Premium Supporter
  • August 20, 2007
    2,161
    747
    To the more experienced devs:

    I want to merge changes from different svn locations and don't know how to do that.

    History:
    - In april I loaded an svn version of a plugin locally
    - I created a local SVN on my dev PC
    - I checked in this downloaded version as "inital version"
    - I made lot's of changes - now being at revision "49"
    - In between the original author checked in an updated revision of the code

    So now I have local updates and an update in sourcefourge svn.

    What I want to do is merge the sourceforgechanges into my local code (my local code is not yet good enough to check it in sourceforge i think ....)

    So I would assume I need to create a unified patch file from sourceforge for the latest update and import that one locally against latest revision49 ?

    I don't see the way how to do that - can any experienced user point me into the right direction?

    Thanks, Guzzi
     

    Users who are viewing this thread

    Top Bottom