Synchronet v3.19b-Win32 (install) has been released (Jan-2022).

You can donate to the Synchronet project using PayPal.

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revisionPrevious revision
Next revision		Previous revision
Next revisionBoth sides next revision
howto:git [2021/03/09 00:31] – [Push Without Merge Commit] Document git-up alias. digital manhowto:git [2022/10/19 20:31] – [Merge Upstream Changes into Your Branch] Need merge from remote tracking 'master' branch digital man
Line 32: Line 32:
   * https://gitlab.com/SynchronetBBS/sbbs   * https://gitlab.com/SynchronetBBS/sbbs
  
 +==== Branches ====
 +
 +The ''master'' branch may occasionally not successfully build for your specific platform. If this happens, checking out the latest successful-nightly-build for your platform should resolve this issue. e.g. for Linux-x64:
 +
 +  $ git checkout dailybuild_linux-x64
 +
 +If you wish to switch back to the ''master'' branch a later point:
 +
 +  $ git checkout master
 ==== Read-only Directories ==== ==== Read-only Directories ====
  
Line 55: Line 64:
  
   $ git pull   $ git pull
-  $ git merge master+  $ git merge origin/master
  
 ===== Push Without Merge Commit ===== ===== Push Without Merge Commit =====
Line 78: Line 87:
  
 To create a convenient alias for the ''git pull --rebase'' usage  above: To create a convenient alias for the ''git pull --rebase'' usage  above:
-  git config --global alias.up "pull --rebase --autostash"+  $ git config --global alias.up "pull --rebase --autostash"
 Now you can just run ''git up'' instead of ''git pull''. Now you can just run ''git up'' instead of ''git pull''.
 ===== Push Without Password ===== ===== Push Without Password =====

Trace: