Remerge a bunch of changes from a manual diff because git failed at commit or pushing the changes to upstream.  I am really sick and tired of all of this software
fail every time I sit down to do anything.  For each hour I spend wrighting software, I end up spending an additional 2 trying to fix the tools I need
to write software.

every hour I spend .