To prevent the Diplo knocking you away while taming, build a one wall high box for yourself. It'll just push you into the wall and you can keep running over to feed it

More Diplodocus Taming & KO Tips