Re: Managing conflicts in a widely distributed development environment

Brad Stiles <bradstiles <at> bellsouth.net> writes:

>
> How do other distributed teams manage conflict resolution when merging
> entire branches back to a trunk when the person(s) doing the merge may not
> be the person(s) who originally committed the conflicting check-ins, and in
> fact may not be familiar with the section of code where the conflict occurs?
> ..snip
>
> Thanks for comments.
> Brad
>
Sorry to not answer the question !
but
I guess a /little/ coordination between developers occasionally
doesn't do any harm !

You can't rely on the tool to eliminate all the project scheduling,
but a little planning goes a long way.

Just from personal experience, when I know I am changing a "busy" area
I try to split the work into self-contained units, that will tolerate
being interleaved with other people's work.

I do try to get any renaming/extra definitions in early on - even
as a "no change in functionality" step - as groundwork for later changes.
(Obviously, API changes do need careful coordination with other workers.)

Anything to make resolving merge conflicts easier !

Regards,
MikeW

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu May 31 10:26:38 2007