[Adium-devl] Merges and Merge Practices

[Matt Handley]

Actually, this is an entirely different set of accidentally adding
header to the project target. I didn't merge those changes; I made
different ones and referenced that email so that other people would
know why I did it.

Hope that clears up any confusion. :)
Matt

On 7/31/07, Augie Fackler <lists at durin42.com> wrote:
> Hey all,
>
> I know I haven't gotten to writing any kind of merging best practices
> yet, but r20440 reminds me of one:
>
> Don't cherry-pick changes from trunk. The Right Way is to merge all
> changes from trunk in contiguous blocks, that way you don't end up
> with merge conflicts. The only sane time to cherry pick is when a
> given branch will never merge back in, like the 1.1 branch.
>
> Note that this particular practice is good practice anyway, but will
> be less mandatory in 1.5 when merge tracking is available.
>
> On a related note, I'd like to do another merge from trunk to SoC
> branches. Does anyone *not* want a merge?
>
> Peace,
> Augie
>
>
> _______________________________________________
> Adium-devl mailing list
> Adium-devl at adiumx.com
> http://adiumx.com/mailman/listinfo/adium-devl_adiumx.com
>