Blog

    Solving git conflicts with sed



    I recently experienced a git merge that kept both versions of the files and merged them together, ending in committing the merged version to the repo. Of course the software (KiCAD) wouldn't open the more...