1. Forum
  2. FidoNet
  3. SYNCHRONET

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

    From wiki.synchro.net@1:103/705 to All on Thursday, September 03, 2020 20:15:23
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    Add clone section
    --- SBBSecho 3.11-Linux
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
  • From wiki.synchro.net@1:103/705 to All on Friday, September 04, 2020 17:05:35
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    [Mirrors] updated github and gitlab mirror names to be consistent
    --- SBBSecho 3.11-Linux
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
  • From wiki.synchro.net@1:103/705 to All on Saturday, September 05, 2020 10:06:22
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    how to push without password prompt
    --- SBBSecho 3.11-Linux
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
  • From wiki.synchro.net@1:103/705 to All on Sunday, September 06, 2020 00:50:59
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    More tips
    --- SBBSecho 3.11-Linux
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
  • From wiki.synchro.net@1:103/705 to All on Sunday, September 06, 2020 00:53:32
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    [Merge Upstream Changes into Your Branch]
    --- SBBSecho 3.11-Linux
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
  • From wiki.synchro.net@1:103/705 to All on Thursday, September 17, 2020 21:33:16
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    [Create and Checkout a Branch] typo
    --- SBBSecho 3.11-Linux
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
  • From wiki.synchro.net@1:103/705 to All on Wednesday, September 30, 2020 10:05:04
    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
    --- SBBSecho 3.11-Linux
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
  • From wiki.synchro.net@1:103/705 to All on Wednesday, September 30, 2020 18:19:33
    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
    --- SBBSecho 3.11-Linux
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
  • From wiki.synchro.net@1:103/705 to All on Wednesday, September 30, 2020 19:38:01
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    Created "updating an Install from CVS" instructions
    --- SBBSecho 3.11-Linux
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
  • From wiki.synchro.net@1:103/705 to All on Sunday, October 04, 2020 13:58:43
    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
    --- SBBSecho 3.11-Linux
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
  • From alterego@1:103/705 to Digital Man on Monday, October 05, 2020 09:27:56
    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!
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
  • From wiki.synchro.net@1:103/705 to All on Sunday, October 04, 2020 18:40:45
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    [Stash] Mention the possible for merge conflicts when running "git stash pop" --- SBBSecho 3.11-Linux
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
  • From wiki.synchro.net@1:103/705 to All on Monday, November 23, 2020 00:14:59
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    [Clone] Changed the 'sbbs' group to 'main' (old path/URL still valid)
    --- SBBSecho 3.11-Linux
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
  • From wiki.synchro.net@1:103/705 to All on Sunday, November 29, 2020 13:45:13
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    Delete the Repo: just say no!
    --- SBBSecho 3.11-Linux
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
  • From digital man@1:103/705 to wiki.synchro.net on Monday, February 22, 2021 13:26:38
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    Remove references to USE_DOSEMU (no longer used).
    --- SBBSecho 3.13-Linux
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
  • From digital man@1:103/705 to wiki.synchro.net on Saturday, March 06, 2021 14:02:20
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    [Push Without Merge Commit] pull with rebase to avoid merge commit
    --- SBBSecho 3.13-Linux
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
  • From digital man@1:103/705 to wiki.synchro.net on Saturday, March 06, 2021 15:50:40
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    [Push Without Merge Commit] Include --autostash in the suggested rebase pull command
    --- SBBSecho 3.13-Linux
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
  • From digital man@1:103/705 to wiki.synchro.net on Tuesday, March 09, 2021 00:31:59
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    [Push Without Merge Commit] Document git-up alias.
    --- SBBSecho 3.13-Linux
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
  • From digital man@1:103/705 to wiki.synchro.net on Saturday, February 12, 2022 01:27:26
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    Mention the nightly build branch (for the rare master branch build failures) --- SBBSecho 3.14-Linux
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
  • From digital man@1:103/705 to wiki.synchro.net on Saturday, February 12, 2022 01:28:54
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    [Branches] typo and such
    --- SBBSecho 3.14-Linux
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
  • From digital man@1:103/705 to wiki.synchro.net on Saturday, February 12, 2022 01:29:34
    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
    --- SBBSecho 3.14-Linux
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
  • From digital man@1:103/705 to wiki.synchro.net on Saturday, February 12, 2022 01:29:59
    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 --- SBBSecho 3.14-Linux
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
  • From digital man@1:103/705 to wiki.synchro.net on Wednesday, October 19, 2022 20:31:46
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    [Merge Upstream Changes into Your Branch] Need merge from remote tracking 'master' branch
    --- SBBSecho 3.15-Linux
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
  • From digital man@1:103/705 to wiki.synchro.net on Wednesday, October 19, 2022 20:41:51
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    [Updating an Install from CVS] missing word
    --- SBBSecho 3.15-Linux
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
  • From digital man@1:103/705 to wiki.synchro.net on Friday, March 22, 2024 21:59:16
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    Create [Reset] section using Deuce's steps
    --- SBBSecho 3.20-Linux
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)
  • From digital man@1:103/705 to wiki.synchro.net on Friday, March 22, 2024 22:02:43
    Wiki edit of http://wiki.synchro.net/howto:git by digital man:
    [Reset] fix typo and such
    --- SBBSecho 3.20-Linux
    * Origin: Vertrauen - [vert/cvs/bbs].synchro.net (1:103/705)