OK I thought that doing "git checkout --theirs" would just use the existing copy from master, I'll keep that in mind going forward. So in this case should it read: '-For logging, use printf style formatting. E.g. ``logging.info("%s %s", foo, bar)``
 -using the appropriate logger name and logging level.’ which it what diff days it was changed from? Because @mtomwing mentioned something about the root logger ?(although both versions of this diff say to use the appropriate logging level)