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
    Phantasm (phnt@fluffytail.org)'s status on Sunday, 25-May-2025 05:55:37 JSTPhantasmPhantasm
    in reply to
    • waifu
    • Arcana

    @waifu @arcana I'm honestly kinda confused. It complains about a merge-conflict to master, but it doesn't make sense to me. Looks like some changes from master aren't in the PR branch.

    Try git rebase main on the feature branch for that PR and see what git complains about in the bot/db_utils.py file. That will attempt to take your commits from the point your feature branch and master diverged, update your feature branch to newest master and readd your commits.

    In conversationabout 8 days ago from fluffytail.orgpermalink
  • 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.