Jonkman Microblog
  • Login
Show Navigation

  • Public

    • Public
    • Network
    • Groups
    • Popular
    • People

Conversation

Notices

  1. beatrix bitrot (bea@glitch.social)'s status on Wednesday, 11-Oct-2017 12:14:52 EDT beatrix bitrot beatrix bitrot

    is there a good way with git and/or github for people to collaborate on resolving large horrible merges?

    In conversation Wednesday, 11-Oct-2017 12:14:52 EDT from glitch.social permalink
    1. DJ Sundog - from the toot-lab (djsundog@toot-lab.reclaim.technology)'s status on Wednesday, 11-Oct-2017 12:19:56 EDT DJ Sundog - from the toot-lab DJ Sundog - from the toot-lab
      in reply to

      @bea last night I said out loud to my monitor "I wish I could just email in patches to try and help merge some of this crap"

      In conversation Wednesday, 11-Oct-2017 12:19:56 EDT from toot-lab.reclaim.technology permalink
  • Help
  • About
  • FAQ
  • TOS
  • Privacy
  • Source
  • Version
  • Contact

Jonkman Microblog is a social network, courtesy of SOBAC Microcomputer Services. It runs on GNU social, version 1.2.0-beta5, available under the GNU Affero General Public License.

Creative Commons Attribution 3.0 All Jonkman Microblog content and data are available under the Creative Commons Attribution 3.0 license.

Switch to desktop site layout.