bash

Merge conflicts happen. With lock files, this can happen if you have different packages (or package versions) installed than in the branch you want to merge.

As software developers, we have powerful tools we sometimes don‘t think of. A few days ago I was waiting for a press release on local government‘s website. I knew the day, but not the time that the update should come. So I wrote a BASH script.