CODEWITHSUNDEEP
javaeclipsesvnmerge
shubhanshu
shubhanshu

Reputation: 97

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

I am working in one java project and my colleague working in another java project in different machine.We store our both project in server via SVN.Question is how to merge my project and colleague project because both project works together as a war file???how to merge using SVN and server?

Upvotes: 1

Views: 2652

Answers (1)

Rajesh J Advani
Rajesh J Advani

Reputation: 5710

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.

Upvotes: 1

Related Questions