Masimatutu to Memes@lemmy.ml · 1 year agoEvery timemedia.wetdry.worldimagemessage-square43fedilinkarrow-up1526arrow-down130file-text
arrow-up1496arrow-down1imageEvery timemedia.wetdry.worldMasimatutu to Memes@lemmy.ml · 1 year agomessage-square43fedilinkfile-text
alt text wayward vagabond from homestuck: we should improve technology somewhat. well dweller: xkcd 927 “standards”
minus-squareTroy@lemmy.calinkfedilinkarrow-up6arrow-down1·1 year agoI actually miss SVN. It had a lot of issues, yes, but the cognitive barrier was so much smaller. When I have a merge error in git, I basically just delete my repo and make a new one…
minus-squareKogasa@programming.devlinkfedilinkarrow-up4·1 year agohttps://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line
I actually miss SVN. It had a lot of issues, yes, but the cognitive barrier was so much smaller. When I have a merge error in git, I basically just delete my repo and make a new one…
https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line