Peter Kümmel wrote:
Georg Baum wrote:So if you want to be nice, merge everything up to the revision of your changes. Otherwise, don't merge anything.Oh, I see, it would have been better to send patches to Abdel instead of checking in some stuff, when I don't wanna a complete merge by myself.
The impact was very minimal in this case but I agree (with both of you) that a patch is probably better if it is a "manual merge" with trunk.
Abdel.
