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
    raboof (raboof@merveilles.town)'s status on Wednesday, 05-Apr-2023 20:06:26 JSTraboofraboof
    in reply to

    Unfortunately, you'll have to solve all merge conflicts again.

    If you had "git rerere" enabled, it can at least have it re-solve 'both modified' conflicts for you, though you'll still have to explicitly 'add' them and it won't solve conflicts in added/removed files.

    If you didn't have "git rerere" enabled yet, you can try "rerere-train.sh HEAD" https://raw.githubusercontent.com/git/git/master/contrib/rerere-train.sh

    https://www.git-scm.com/book/en/v2/Git-Tools-Rerere

    In conversationWednesday, 05-Apr-2023 20:06:26 JST from merveilles.townpermalink

    Attachments



  • 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.