aeharding@lemmy.worldM to Voyager@lemmy.worldEnglish · 1 year agoJust realized yesterday I watched an episode of Voyager, read another chapter of Voyager, and worked on Voyager crosspostsmessage-squaremessage-square12fedilinkarrow-up147arrow-down17file-text
arrow-up140arrow-down1message-squareJust realized yesterday I watched an episode of Voyager, read another chapter of Voyager, and worked on Voyager crosspostsaeharding@lemmy.worldM to Voyager@lemmy.worldEnglish · 1 year agomessage-square12fedilinkfile-text
minus-squarephobiac@lemmy.worldlinkfedilinkEnglisharrow-up10·1 year agoHow would you handle detangling a mistaken git merge of two branches to create the Tuvix branch? Kill that branch and clone down the originals or let them stay merged?
How would you handle detangling a mistaken git merge of two branches to create the Tuvix branch? Kill that branch and clone down the originals or let them stay merged?
git revert neelix