According to the National Literacy Strategy, a comma should only be used before the conjunction 'but' and not before 'and' or 'or'.
How do I decide whether you or the NLS is correct?
Careful.
Firstly: look to see whether the information you have is talking about a comma before conjunctions introducing subordinate clauses, or independent clauses.