Conversation

Notices

1. Embed this notice
   Ryan Castellucci :nonbinary_flag: (ryanc@infosec.exchange)'s status on Sunday, 21-Apr-2024 05:27:51 JST Ryan Castellucci :nonbinary_flag:

   • Natasha Nox 🇺🇦🇵🇸
   • Marsh Ray

   @marshray @Natanox Here's the diff between the publicly available version that didn't have the bug and the one where it had been added:

   https://gist.github.com/ryancdotorg/c5e92a5241125ce57e33bbda94ee7ab0

   • Embed this notice
     Marsh Ray (marshray@infosec.exchange)'s status on Sunday, 21-Apr-2024 06:12:25 JST Marsh Ray

     in reply to

     • Natasha Nox 🇺🇦🇵🇸
     • Marsh Ray

     @ryanc @marshray @Natanox Yeah.
     Having used many source code control systems over decades, that just deeply feels like a merge mistake.
     Imagine some invisible whitespace change introduced by different tooling. A tab character or line terminator is automatically “normalized” before checkin.
     Then the merge UI presents the developer with three lines in a row that all say “goto fail;”, each line a different color.
     The developer must click the circle, the triangle, or the square, or an icon with all three, to resolve the conflict.
     What’ll it be: “yours”, or “theirs”, “merged”, or “both”?