pxa-devel back-merge / cherry pick request

[Russell King - ARM Linux]

On Mon, May 31, 2010 at 02:22:34PM +0100, Mark Brown wrote:
> On Mon, May 31, 2010 at 03:13:17PM +0200, Daniel Mack wrote:
> 
> > Just out of interest - why would cherry-picking be frowned upon?
> > Shouldn't git just ignore the commits it already knows when things are
> > pulled?
> 
> No, git is content based.  The merge should be a noop merge if the two
> sides end up being the same but you still end up with two different
> copies of the change in history.

Sometimes it actually causes merge conflicts if there are changes in
the same part of the file as the picked patch touches which aren't
also cherry-picked.

It's best to avoid cherry-picking commits into two different git
threads and then try to merge them.