• KubeRoot@discuss.tchncs.de
    link
    fedilink
    English
    arrow-up
    1
    ·
    15 days ago

    I would recommend doing it manually - you can get a GUI diff tool (I like Meld), run it with both the normal file and pacnew, and merge every change from the pacnew into the main file.