1. Forum
  2. FidoNet
  3. SYNCHRONET

  • Re: Issue upgrading in linux

    From Michael Long@1:103/705 to alt.bbs.synchronet on Tue Oct 13 07:01:06 2020
    From Newsgroup: alt.bbs.synchronet

    Ok I have it all working now with git. I think the wiki might need to be tweaked a bit, because if you make a local branch and try to do a git pull while your branch is checked out, it's just going to complain about no upstream. I would usually either commit or stash, then checkout master and pull then, switch back to my own branch and merge master. There may be a more efficient way though.
    --- Synchronet 3.18c-Win32 NewsLink 1.113
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
  • From Digital Man@1:103/705 to Michael Long on Tue Oct 13 11:14:20 2020
    Re: Re: Issue upgrading in linux
    By: Michael Long to alt.bbs.synchronet on Tue Oct 13 2020 07:01 am

    From Newsgroup: alt.bbs.synchronet

    Ok I have it all working now with git. I think the wiki might need to be tweaked a bit, because if you make a local branch and try to do a git pull while your branch is checked out, it's just going to complain about no upstream. I would usually either commit or stash, then checkout master and pull then, switch back to my own branch and merge master. There may be a more efficient way though.

    Yeah, I don't have local branch instructions on the wiki yet. Feel free to add them.

    digital man

    Synchronet/BBS Terminology Definition #74:
    SyncEdit = A defunct 3rd party full-screen editor written for Synchronet
    Norco, CA WX: 88.4øF, 27.0% humidity, 0 mph SSW wind, 0.00 inches rain/24hrs --- SBBSecho 3.11-Linux
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)