how to merge two or more java project in eclipse via svn

Question

我正在一个Java项目中工作，而我的同事在另一台机器上的另一个Java项目中工作。我们通过SVN将我们的两个项目存储在服务器中。问题是如何合并我的项目和同事的项目，因为两个项目都可以作为战争文件一起工作？如何使用SVN与服务器合并？

Answer 1

If you want to merge your code with that of your colleague, you should both be committing the code into the same SVN repository.

If you're both committing to the same branch, then you just need to use Team -> Synchronize to get the latest code from the repository.

If you're both committing to different branches, then you need to merge from your colleague's branch to your branch (or vice versa). To do this, make sure your have the latest code from your branch - use Team->Synchronize - and then use Team->Merge to select your colleague's branch as the source of the merge. Then resolve any conflicts, and commit your change.