These are chat archives for cherrypy/cherrypy
CherryPy is a pythonic, object-oriented HTTP framework. | post your issues to: github.com/cherrypy/cherrypy/issues | FAQ: https://stackoverflow.com/questions/tagged/cheroot+or+cherrypy
Squash and merge.
Rebase and mergeif we need to preserve commits from feature branch.
masterbranch history log much more nice to read :)
Fix of a fix,
Final fixinto master making it look dirty. I think those have to be squashed into something relevant. Perhaps one doing the PR must reorder, rebase and squash their feature-branch on per-change basis (i.e. keeping only those commits that matter) by themself right before the merge to keep the history clean.