Using TortoiseSVN how do I merge changes from the trunk to a branch and vice versa?

by

I couldn’t properly follow the other answers, here’s more of a dummies guide…

You can do this either way round to go trunk -> branch or branch -> trunk. I always first do trunk -> branch fix any conflicts there and then merge branch -> trunk.

Merge trunk into a branch / tag

  1. Checkout the branch / tag
  2. Right-click on the root of the branch | Tortoise SVN | Merge …
  3. Merge Type: Merge a range of revisions | Click ‘Next’
    enter image description here
  4. Merge revision range: Select the URL of the trunk directory that you copied to the branch / tag. Enter the revisions to merge or leave the field empty to merge all revisions | click ‘Next’
    enter image description here
  5. Merge options: I just left these as default | click ‘Merge’
    enter image description here
  6. This will merge the revisions into the checked out branch / tag
  7. Then commit the merged changes to the branch / tag

Leave a Comment

Hata!: SQLSTATE[HY000] [1045] Access denied for user 'divattrend_liink'@'localhost' (using password: YES)