So I use a lot of trace-code/logging when starting a new project, or debugging an existing one. I was wondering what techniques do you use to manage it, as I always end up deleting it before doing a commit, and then have to rewrite it if ever something else goes wrong.
I was thinking about having a development branch with all the trace-code, and the master would be clean, but it seems like it would be hard to sift through what is debugging code, and what should be merged.
Any suggestions?