Login or sign up Lost password?
Login or sign up
Developers are fond of recounting their disastrous experiences branching and merging in Subversion and CVS. Then, you realize that while you’re not done with your branch yet, you need to get those trunk changes into your branch. You do this by taking all the changes in trunk that happened after revision 100 and applying them to your branch. In reality, you are already pretty screwed at this point, you just don’t realize it. You are happy with your branch; you want to commit it to trunk and let the rest of your team in on your brilliance.