GNU social JP
  • FAQ
  • Login
GNU social JPは日本のGNU socialサーバーです。
Usage/ToS/admin/test/Pleroma FE
  • Public

    • Public
    • Network
    • Groups
    • Featured
    • Popular
    • People

Embed Notice

HTML Code

Corresponding Notice

  1. Embed this notice
    Marsh Ray (marshray@infosec.exchange)'s status on Sunday, 21-Apr-2024 06:12:25 JSTMarsh RayMarsh Ray
    in reply to
    • Natasha Nox 🇺🇦🇵🇸
    • Ryan Castellucci :nonbinary_flag:
    • 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”?

    In conversationabout a year ago from infosec.exchangepermalink
  • Help
  • About
  • FAQ
  • TOS
  • Privacy
  • Source
  • Version
  • Contact

GNU social JP is a social network, courtesy of GNU social JP管理人. It runs on GNU social, version 2.0.2-dev, available under the GNU Affero General Public License.

Creative Commons Attribution 3.0 All GNU social JP content and data are available under the Creative Commons Attribution 3.0 license.