Le lundi 25 avril 2011 à 04:47 +0200, Jesus Cea a écrit :
> If a patch in 3.2 is not applicable in 3.3, a "null merge" should be
> done.
Correct. Sorry, I forgot that. And yes, the 3.2 fix was not applicable
to 3.3, that's why I forgot to merge.
> If not, next developer tring to merge will find s
On Mon, 25 Apr 2011 04:47:03 +0200
Jesus Cea wrote:
>
> And yes, I fully realized that I should try to compile locally first.
> Dealing with this unexpected merge when merging my own patch was...
> unexpected, and the code seemed sensible enough.
You should *always* recompile and run the affecte
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
If a patch in 3.2 is not applicable in 3.3, a "null merge" should be
done. If not, next developer tring to merge will find some other
unrelated code to merge, and she doesn't have the context knowledge to
know what to do :-).
In this case, I merged co
