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 git anyways: From the directory you are trying to “git pull”

Your shell will read “Fetching origin” Then execute the git reset command:

You will see something similar to this output: HEAD is now at 76637bf fix truncate…

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 the mount went bad. It was throwing an ¬†error when I tried to mount the file system again:

Since the local cache could be corrupt, let’s go ahead and clear it: Your cache directory should be .cache in your…

Read More

Use screen to maintain persistent SSH sessions after disconnecting and reconnecting

I find myself stuck in situations where I can’t really leave or close my shell session, but I have to go somewhere else, disconnect my internet, or otherwise lose shell access for some reason or another and unable to get back where I left off. Things like this happen sometimes, right? Or is it just me? The solution for this is¬†screen Overview of Screen: Screen is a full-screen window manager that multiplexes a physical terminal between several processes, typically interactive shells. Each virtual terminal provides the functions of the DEC…

Read More