What's the difference between oil-free and non-comedogenic makeup?

They say if you have acne-prone skin, you should use oil-free or non-comedogenic makeup. I have some oil-free makeup, and I have some non-comedogenic makeup. Yet I don't know which one is best for my skin. Any help pretty please?
8 answers 8