How to git pull and overwrite file conflicts

I use git for version control. One of the biggest conveniences for me is running “git pull” to download the latest commits. But sometimes, the git pull fails because of a file that changed on the server. That’s usually my fault.

So here’s how to go about pulling from Read more…

How to: Fix acd_cli ERROR: sqlite3.DatabaseError: database disk image is malformed

I was using acd_cli, mounted to my file system last night, and picked up today to finish up. I navigated to the directory I mount ACD in and listed the contents.

Only to see an error that I haven’t seen yet (in my experience with ACD_CLI.) I thought maybe Read more…