Refactoring and source control: how?

Question

I completely agree with the ideas of TDD, Refactoring and Patterns, however it seems that these ideas have a huge gaping whole, basically that they are great for the development teams of 1, but when you start refactoring the code that 10 people work on so that you start getting merge conflicts everywhere and most diff / merge programs cannot say that you have reorganized the function into your class.

How do you clear your code, refactoring without causing serious headaches for everyone on your team?

Answer 1

Small changes are often made.

, , . . , . .

, , .

Answer 2

, . , . , , TDD ( , , , ).

, - , , , , . .

Answer 3

. . , .

Answer 4

, . , , .

Answer 5

, , , .

• 10 ?
• , / ( )?

, , , . , , . , , dvcs (git, mercurial, bazaar) , .

Answer 6

, , :

• , , , - , .
• , , , . .
• .
• , .
• , .

, .

Answer 7

.

, .

, - - / ", , FooBar ".

, , 10 , . . . , , , , , , , .

, . , , . , , , .

Answer 8

. . , . , , . , , , . . , . ( , , ). , , ..

, , , - , . , . , , , , . , , . , , , , , , 1000 , , , , . , .

Answer 9

In my experience, merge conflicts rarely occur during small and medium scale reorganizations in flexible projects. Great refactoring efforts can introduce some pain during fusion, but if done in bite-sized chunks, the pain can be significantly reduced. Combining pain can also be reduced by using Subversion as SCM, since SVN will automatically generate non-conflict changes.

This strategy has worked well for teams in which I was a part, and most of these teams are couples with a higher level of development.