SVN – Merge trunk revisions into branch

While working on one of our projects which uses SVN for version control, I had to merge in some changes from trunk to the branch. I did this as explained below: First checkout the branch where you want to merge revisions from trunk svn co http://svn_repo_url/project/branches/branch my_branch cd my_branch svn log -v –limit 100 # […]

Read more "SVN – Merge trunk revisions into branch"

SVN Merge – Branch into Trunk

So you are working on this humongous project and its that time when everyone in the team has to start working on different modules or functionalities. The way to proceed is to create module branches and start working on it. Sooner than you may think, you would be required to merge all those branches into […]

Read more "SVN Merge – Branch into Trunk"