aͮͫͨ͋ͤͣ͌̏lex͒̃ͪ̃ͨ͛́͂ͪ͗̏ͫͮ̂@lemmy.worldM to Voyager@lemmy.worldEnglish · 10 months agoJust realized yesterday I watched an episode of Voyager, read another chapter of Voyager, and worked on Voyager crosspostsmessage-squaremessage-square12fedilinkarrow-up146arrow-down17file-text
arrow-up139arrow-down1message-squareJust realized yesterday I watched an episode of Voyager, read another chapter of Voyager, and worked on Voyager crosspostsaͮͫͨ͋ͤͣ͌̏lex͒̃ͪ̃ͨ͛́͂ͪ͗̏ͫͮ̂@lemmy.worldM to Voyager@lemmy.worldEnglish · 10 months agomessage-square12fedilinkfile-text
minus-squarephobiac@lemmy.worldlinkfedilinkEnglisharrow-up10·10 months 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?
minus-squareaͮͫͨ͋ͤͣ͌̏lex͒̃ͪ̃ͨ͛́͂ͪ͗̏ͫͮ̂@lemmy.worldOPMlinkfedilinkEnglisharrow-up9·10 months agogit revert neelix
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