How can I combine code from a branch into a trunk?

Question

I am using the subeclipse plugin for eclipse for SVN. My project looks like this:

ProjectName \
- branches
- special_
- tags
- trunk

Currently, I extracted the project from special_, and I changed and added one class, how can I combine the code that I updated / added in trunk? I will take everything into account

Answer 1

So you want to combine your change from special_ to trunk ? I believe that you will want to continue this.

• (Make sure you make all your changes to special_.)

• Team --> Switch to another branch/tag/revision... trunk ( ) , .

• Team --> Merge , . URL- "" special_ ( , .. , ). "From Revision" special_, , - , , special_ trunk (, , , ).

• "To Revision", special_ (= ).

• merge - Dry run, , , Merge .

• , , , .

• , trunk . , , commit (= X Y special_ trunk ..).

, .

Answer 2

-, , "svn add" . .

. .