Home/ Questions/Q 6629411
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-25T22:15:22+00:00

I have a master-branch called trunk and a branch of it called prototype has

  • 0

I have a master-branch called trunk and a branch of it called prototype has been created.

Since the branch happened, commits have been done in both trunk and prototype (sometimes even the same files).

What’s the best way to update the prototype so that it contains all new commits from the trunk without losing the prototype-commits?

I just tried to rightclick on my projectfolder -> Team -> Merge, selected the trunk as From: and my prototype as To:. I also checked both Merge from HEAD revision.

But after this some new files of prototype were missing.

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    First of all, the merge must be done on the working copy of the prototype branch.

    A merge consists in applying a diff between two versions of some branch to another branch. The From and the To must thus both point to the trunk. You want to apply, on the prototype branch, the changes made on trunk, from revision X to revision Y.

    This is very well explained in the SVN book.

    • 0