1. Forum
  2. USENET
  3. alt.bbs.synchronet

  • [wiki.synchro.net] page changed: howto:git

    From wiki.synchro.net@wiki.synchro.net@vert.synchro.net.remove-76m-this to All on Thu Sep 3 20:15:23 2020
    From Newsgroup: alt.bbs.synchronet

    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    Add clone section
    --- Synchronet 3.18a-Win32 NewsLink 1.113
    * Vertrauen - Riverside County, California - telnet://vert.synchro.net
    --- Synchronet 3.19c-Linux NewsLink 1.113
  • From wiki.synchro.net@wiki.synchro.net@vert.synchro.net.remove-taj-this to All on Fri Sep 4 17:05:35 2020
    From Newsgroup: alt.bbs.synchronet

    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    [Mirrors] updated github and gitlab mirror names to be consistent
    --- Synchronet 3.18a-Win32 NewsLink 1.113
    * Vertrauen - Riverside County, California - telnet://vert.synchro.net
    --- Synchronet 3.19c-Linux NewsLink 1.113
  • From wiki.synchro.net@wiki.synchro.net@vert.synchro.net.remove-xl1-this to All on Sat Sep 5 10:06:22 2020
    From Newsgroup: alt.bbs.synchronet

    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    how to push without password prompt
    --- Synchronet 3.18a-Win32 NewsLink 1.113
    * Vertrauen - Riverside County, California - telnet://vert.synchro.net
    --- Synchronet 3.19c-Linux NewsLink 1.113
  • From wiki.synchro.net@wiki.synchro.net@vert.synchro.net.remove-sft-this to All on Sun Sep 6 00:50:59 2020
    From Newsgroup: alt.bbs.synchronet

    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    More tips
    --- Synchronet 3.18a-Win32 NewsLink 1.113
    * Vertrauen - Riverside County, California - telnet://vert.synchro.net
    --- Synchronet 3.19c-Linux NewsLink 1.113
  • From wiki.synchro.net@wiki.synchro.net@vert.synchro.net.remove-96t-this to All on Sun Sep 6 00:53:32 2020
    From Newsgroup: alt.bbs.synchronet

    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    [Merge Upstream Changes into Your Branch]
    --- Synchronet 3.18a-Win32 NewsLink 1.113
    * Vertrauen - Riverside County, California - telnet://vert.synchro.net
    --- Synchronet 3.19c-Linux NewsLink 1.113
  • From wiki.synchro.net@wiki.synchro.net@vert.synchro.net.remove-10f2-this to All on Thu Sep 17 21:33:16 2020
    From Newsgroup: alt.bbs.synchronet

    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    [Create and Checkout a Branch] typo
    --- Synchronet 3.18b-Win32 NewsLink 1.113
    * Vertrauen - Riverside County, California - telnet://vert.synchro.net
    --- Synchronet 3.19c-Linux NewsLink 1.113
  • From wiki.synchro.net@wiki.synchro.net@vert.synchro.net.remove-mdp-this to All on Wed Sep 30 10:05:04 2020
    From Newsgroup: alt.bbs.synchronet

    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    Explain how to make updates to text and exec dirs seamless using config changes or symlinks
    --- Synchronet 3.18c-Win32 NewsLink 1.113
    * Vertrauen - Riverside County, California - telnet://vert.synchro.net
    --- Synchronet 3.19c-Linux NewsLink 1.113
  • From wiki.synchro.net@wiki.synchro.net@vert.synchro.net.remove-fl5-this to All on Wed Sep 30 18:19:33 2020
    From Newsgroup: alt.bbs.synchronet

    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    [Read-only Directories] mention the SBBSEXEC env variable needs to match the exec dir location
    --- Synchronet 3.18c-Win32 NewsLink 1.113
    * Vertrauen - Riverside County, California - telnet://vert.synchro.net
    --- Synchronet 3.19c-Linux NewsLink 1.113
  • From wiki.synchro.net@wiki.synchro.net@vert.synchro.net.remove-pb8-this to All on Wed Sep 30 19:38:01 2020
    From Newsgroup: alt.bbs.synchronet

    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    Created "updating an Install from CVS" instructions
    --- Synchronet 3.18c-Win32 NewsLink 1.113
    * Vertrauen - Riverside County, California - telnet://vert.synchro.net
    --- Synchronet 3.19c-Linux NewsLink 1.113
  • From wiki.synchro.net@wiki.synchro.net@vert.synchro.net.remove-r2f-this to All on Sun Oct 4 13:58:43 2020
    From Newsgroup: alt.bbs.synchronet

    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    Stash: solve error: Your local changes to the following files would be overwritten by merge
    --- Synchronet 3.18c-Win32 NewsLink 1.113
    * Vertrauen - Riverside County, California - telnet://vert.synchro.net
    --- Synchronet 3.19c-Linux NewsLink 1.113
  • From alterego@alterego@ALTERANT.remove-12i6-this to Digital Man on Mon Oct 5 09:27:56 2020
    From Newsgroup: alt.bbs.synchronet

    To: Digital Man
    Re: [wiki.synchro.net] page changed: howto:git
    By: wiki.synchro.net to All on Sun Oct 04 2020 01:58 pm

    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    Stash: solve error: Your local changes to the following files would be overwritten by merge

    You should probably mention, that if you have any CONFLICTs after the "git stash pop", that they probably be resolved otherwise they will have unknown impacts.

    I know that the "git diff" step 5 may show them (a different way, well as not a conflict to the untrained eye) and I can see you being bombarded with "it wont ...." messages, which will be hard to help if folks dont tell you they got a conflict on the stash pop.

    Unrelated EG:

    #git stash pop
    Auto-merging Dockerfile
    CONFLICT (content): Merge conflict in Dockerfile

    #git diff
    diff --cc Dockerfile
    index a97fc9f,19e169e..0000000
    -+- a/Dockerfile
    +++ b/Dockerfile
    @@@ -1,42 -1,28 +1,54 @@@
    # NAME leenooks/php
    ++<<<<<<< Updated upstream
    +# VERSION 7.4-fpm-mp
    ++=======
    + # VERSION 7.2-fpm-db2
    Stashed changes

    (Been there, done that, should have got a Tshirt for it.)

    ...лоеп

    ... When in doubt, predict that the trend will continue.

    ---
    ю Synchronet ю Alterant | an SBBS in Docker on Pi!
    --- Synchronet 3.18c-Win32 NewsLink 1.113
    * Vertrauen - Riverside County, California - telnet://vert.synchro.net
    --- Synchronet 3.19c-Linux NewsLink 1.113
  • From wiki.synchro.net@wiki.synchro.net@vert.synchro.net.remove-wkf-this to All on Sun Oct 4 18:40:45 2020
    From Newsgroup: alt.bbs.synchronet

    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    [Stash] Mention the possible for merge conflicts when running "git stash pop" --- Synchronet 3.18c-Win32 NewsLink 1.113
    * Vertrauen - Riverside County, California - telnet://vert.synchro.net
    --- Synchronet 3.19c-Linux NewsLink 1.113
  • From wiki.synchro.net@wiki.synchro.net@vert.synchro.net.remove-42f-this to All on Mon Nov 23 00:14:59 2020
    From Newsgroup: alt.bbs.synchronet

    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    [Clone] Changed the 'sbbs' group to 'main' (old path/URL still valid)
    --- Synchronet 3.18c-Win32 NewsLink 1.113
    * Vertrauen - Riverside County, California - telnet://vert.synchro.net
    --- Synchronet 3.19c-Linux NewsLink 1.113
  • From wiki.synchro.net@wiki.synchro.net@vert.synchro.net.remove-v86-this to All on Sun Nov 29 13:45:13 2020
    From Newsgroup: alt.bbs.synchronet

    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    Delete the Repo: just say no!
    --- Synchronet 3.18c-Win32 NewsLink 1.113
    * Vertrauen - Riverside County, California - telnet://vert.synchro.net
    --- Synchronet 3.19c-Linux NewsLink 1.113
  • From digital man@digital.man@vert.synchro.net.remove-9pg-this to wiki.synchro.net on Mon Feb 22 13:26:38 2021
    From Newsgroup: alt.bbs.synchronet

    To: wiki.synchro.net
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    Remove references to USE_DOSEMU (no longer used).
    --- Synchronet 3.18c-Win32 NewsLink 1.113
    * Vertrauen - Riverside County, California - telnet://vert.synchro.net
    --- Synchronet 3.19c-Linux NewsLink 1.113
  • From digital man@digital.man@vert.synchro.net.remove-i5s-this to wiki.synchro.net on Sat Mar 6 14:02:20 2021
    From Newsgroup: alt.bbs.synchronet

    To: wiki.synchro.net
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    [Push Without Merge Commit] pull with rebase to avoid merge commit
    --- Synchronet 3.18c-Win32 NewsLink 1.113
    * Vertrauen - Riverside County, California - telnet://vert.synchro.net
    --- Synchronet 3.19c-Linux NewsLink 1.113
  • From digital man@digital.man@vert.synchro.net.remove-yqx-this to wiki.synchro.net on Sat Mar 6 15:50:40 2021
    From Newsgroup: alt.bbs.synchronet

    To: wiki.synchro.net
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    [Push Without Merge Commit] Include --autostash in the suggested rebase pull command
    --- Synchronet 3.18c-Win32 NewsLink 1.113
    * Vertrauen - Riverside County, California - telnet://vert.synchro.net
    --- Synchronet 3.19c-Linux NewsLink 1.113
  • From digital man@digital.man@vert.synchro.net.remove-mv4-this to wiki.synchro.net on Tue Mar 9 00:31:59 2021
    From Newsgroup: alt.bbs.synchronet

    To: wiki.synchro.net
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    [Push Without Merge Commit] Document git-up alias.
    --- Synchronet 3.19a-Win32 NewsLink 1.113
    * Vertrauen - Riverside County, California - telnet://vert.synchro.net
    --- Synchronet 3.19c-Linux NewsLink 1.113
  • From digital man@digital.man@vert.synchro.net.remove-zws-this to wiki.synchro.net on Sat Feb 12 01:27:26 2022
    From Newsgroup: alt.bbs.synchronet

    To: wiki.synchro.net
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    Mention the nightly build branch (for the rare master branch build failures) --- Synchronet 3.19c-Win32 NewsLink 1.113
    * Vertrauen - Riverside County, California - telnet://vert.synchro.net
    --- Synchronet 3.19c-Linux NewsLink 1.113
  • From digital man@digital.man@vert.synchro.net.remove-t86-this to wiki.synchro.net on Sat Feb 12 01:28:54 2022
    From Newsgroup: alt.bbs.synchronet

    To: wiki.synchro.net
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    [Branches] typo and such
    --- Synchronet 3.19c-Win32 NewsLink 1.113
    * Vertrauen - Riverside County, California - telnet://vert.synchro.net
    --- Synchronet 3.19c-Linux NewsLink 1.113
  • From digital man@digital.man@vert.synchro.net.remove-k9-this to wiki.synchro.net on Sat Feb 12 01:29:34 2022
    From Newsgroup: alt.bbs.synchronet

    To: wiki.synchro.net
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    ['up' alias] I guess I'm using putting $ prompts before git commands on this page
    --- Synchronet 3.19c-Win32 NewsLink 1.113
    * Vertrauen - Riverside County, California - telnet://vert.synchro.net
    --- Synchronet 3.19c-Linux NewsLink 1.113
  • From digital man@digital.man@vert.synchro.net.remove-mgc-this to wiki.synchro.net on Sat Feb 12 01:29:59 2022
    From Newsgroup: alt.bbs.synchronet

    To: wiki.synchro.net
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    [Branches] I guess I'm using putting $ prompts before git commands on this page --- Synchronet 3.19c-Win32 NewsLink 1.113
    * Vertrauen - Riverside County, California - telnet://vert.synchro.net
    --- Synchronet 3.19c-Linux NewsLink 1.113