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've been on a project using svn and TFS and branching by itself is a really simple thing.

We used branching for release candidate as well as for long lasting or experimental features and for isolating from other team's interference.

The only painful moment in branching is merging, because an old or intensely developed branch may differ a lot from trunk and might require significant effort to merge back.

Having said the above, I would say that branching is a powerful and useful practice which should be taken into account while developing.