Do you feel comfortable merging code?

Question

This morning, I read two opinions on refactoring.

• Opinion 1 (Page not present)
• Opinion 2 (Page not present)

They recommend branching (and s

Answer 1

I use Subversion and consider branching very simple and easy. So to answer question 1.. Yes.

The reason for branching can vary massively. I branch if I feel I should. Quite hard to put rules and reasons down for all possibilities.

However, as far as the "Allow a developer to walk away from risky changes." comment. I totaly agree with that one. I create a branch whenever I want to really play around with the code and wish I was the only developer working on it.. When you branch, you can do that...