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

If merging is too much of a pain, consider migrating to a better VCS. That will be a bigger pain, but only once.