cherry-pick very carefully
Try to apply the change introduced by topic^ again, spending extra time to avoid mistakes based on incorrectly matching context lines
cherry-pick very carefully git cherry-pick -Xpatience topic^Try to apply the change introduced by topic^ again, spending extra time to avoid mistakes based on incorrectly matching context lines