Masimatutu@mander.xyz to Memes@lemmy.ml · 2 years agoEvery timemedia.wetdry.worldimagemessage-square51fedilinkarrow-up1505arrow-down129file-text
arrow-up1476arrow-down1imageEvery timemedia.wetdry.worldMasimatutu@mander.xyz to Memes@lemmy.ml · 2 years agomessage-square51fedilinkfile-text
alt text wayward vagabond from homestuck: we should improve technology somewhat. well dweller: xkcd 927 “standards”
minus-squareKogasa@programming.devlinkfedilinkarrow-up4·2 years agohttps://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line
https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line