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
    Julia Evans (b0rk@social.jvns.ca)'s status on Tuesday, 12-Mar-2024 03:42:18 JSTJulia EvansJulia Evans
    in reply to

    a bunch of people have said that they feel embarrassed that they're still confused about which side of a merge conflict is which, even after many years using git.

    I want to say that I have a hard time with it too (and I am uh EXTREMELY confident in my git skills at this point). Really appreciate everyone sharing their coping strategies for dealing with this not-very-clear UI.

    In conversationabout 9 months ago from social.jvns.capermalink
  • 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.