[Adium-devl] Version control

[Augie Fackler]

On Oct 8, 2007, at 1:31 PM, Richard Laager wrote:

> Regarding merging just one change... If you make one one change on the
> com.adiumx.adiumx.feature branch that you meant to commit on trunk,
> you'll have to use "mtn pluck". That *should* merge fine. That  
> said, you
> should commit the changes to the appropriate branch initially.
>
> Richard

This is the point of major concern to me - we've been doing single- 
change merges and they can cause conflicts. I know Subversion 1.5  
handles this case correctly.

This is probably something we should look into - do we want to  
support this type of use case with whatever tool we end up using?

Augie