search

mendicant-original / newman

Newman: a microframework for building email-based applications.
116 stars 11 forks source link

App logging #20

Closed ericgj closed 12 years ago

ericgj commented 12 years ago

An attempt to move non error-logging into the application/controller, see issue #16. Also re-adds multiple apps in the server.tick. Several questions in the code.

Again I don't know why my rebase fucked up the commits it's picking up (or is that the way it's supposed to work?). It's only the last commit 3c64ea64.

practicingruby commented 12 years ago

What commands are you using to rebase?

ericgj commented 12 years ago 
git checkout app_logging
git pull upstream master
git rebase master
practicingruby commented 12 years ago

It's not necessary to rebase unless you're trying to squash multiple of your own commits into a single commit, which I'd actually prefer that you don't do in most cases. Please try to do a fresh pull request by creating another branch, applying these changes to that branch as you ordinarily would, and then skipping the rebase.

I can always cherry-pick around these problems but I'd prefer if you figure out how to avoid this problem for the future.