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
    Paul Cantrell (inthehands@hachyderm.io)'s status on Monday, 11-Mar-2024 22:24:37 JSTPaul CantrellPaul Cantrell
    in reply to
    • Julia Evans

    @b0rk
    I usually end up inspecting history with a GUI. (I like gitup.co for these sorts of task.)

    This is a situation where GitHub fails extra hard, imo. It seems to me other version control systems somehow aren’t as confusing about how they show the conflict.

    In conversationabout a year ago from hachyderm.iopermalink

    Attachments

    1. Domain not in remote thumbnail source whitelist: gitup.co
      GitUp
      GitUp is Git the way it should be
  • 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.