tests: document cherry-pick behavior in face of conflicts