Flake8 Extension to enforce trailing commas. Usage If you are using flake8 it's as easy as: pip install flake8-commas Now you can avoid those annoying merge conflicts on dictionary and list diffs.