Conversation

Notices

1. Embed this notice
   tef (tef@mastodon.social)'s status on Thursday, 08-May-2025 17:12:50 JST tef

   i spent a few days thinking "how am i gonna handle this weird edge case" and eventually i realised "throw a better error message" was the right answer

   on the plus side i got to replace the caveat in the readme with a "it only breaks if you put garbage in" note

   • Embed this notice
     ✧✦Catherine✦✧ (whitequark@mastodon.social)'s status on Thursday, 08-May-2025 17:12:47 JST ✧✦Catherine✦✧

     in reply to

     • Erin 💽✨

     @erincandescent @tef oooh, nice idea

   • Embed this notice
     Erin 💽✨ (erincandescent@akko.erincandescent.net)'s status on Thursday, 08-May-2025 17:12:49 JST Erin 💽✨

     in reply to
     @tef this reminds me of how one of the best things a past employer has ever done is making it trivial for the computers to raise tickets for humans
     
     Don't know what to do in this edge case? Explicitly punt it to an engineer for now
   • Embed this notice
     tef (tef@mastodon.social)'s status on Thursday, 08-May-2025 17:12:50 JST tef

     in reply to

     because this is mastodon, the edge case is this:

     merging the branches together works when the source repos are non overlapping. it also works if you have two repos with a common history, and those repos do not have any other init commits.

     however, if you have some repo that merges in another repo, and try to weave them together, you can't

     as you're effectively asking it to merge two different histories for a single repo, and that just doesn't work out

   • Embed this notice
     tef (tef@mastodon.social)'s status on Thursday, 08-May-2025 17:14:10 JST tef

     in reply to

     • ✧✦Catherine✦✧
     • Erin 💽✨

     @whitequark @erincandescent i am not a fan of message brokers but i did like the policy that any dropped messages get sent to a human operated address