expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2025-03-22 10:11:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

explanatory article

Browse Source
This commit is contained in:
Philip Sargent 2022-07-23 15:07:44 +03:00
parent 7097fab9a2
commit 9b3cf86925
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
handbook/computing/qstart-git.html
View File

@ -13,6 +13,7 @@
<p>This is NOT a tutorial. This is a set of reminders for people who already know all this stuff.</p>
<p>Since 2019 all use of version control software requires that you have <a href="keyexchange.html">key-pair setup</a> already set up before any of this will work on your own machine.</p>
<p>- check that you can get ssh working before trying to run git too</p>
<p>If you can get to the <em>expo laptop</em> try these commands on that first as the key exchange has already been done. If the key exchnage has not been done then none of this will work.</p>
<p>You can read or clone these repos without any control, but to write ("push") to them you will need to use <var>ssh://expo@expo.survex.com</var> and set up the <a href="keyexchange.html">key exchange</a>.</p>
<p>NOTE: always use user <var>'expo'</var> as the login user (<var>ssh://expo@...</var>) even though within git you will be identified by your own ssh key name.</p>
@ -39,6 +40,7 @@
</dl>
<h3>git use on your machine</h3>
<img class="onright" width=45% src="https://wac-cdn.atlassian.com/dam/jcr:1523084b-d05a-4f5a-bd1a-01866ec09ca3/01%20A%20forked%20commit%20history.svg?cdnVersion=447">
<p>It's much neater to do
<tt>git fetch; git rebase origin master</tt>
than
@ -46,8 +48,7 @@ than
when you have a local change and there are changes on the server. The rebase command
gives a nice linear log rather than trivial merges.
<p>See nice explanantion at <a href="">Merging vs. Rebasing</a>: "The git rebase command has a reputation for being magical Git voodoo that beginners should stay away from, but it can actually make life much easier for a team.."
<img class="onright" widgt=45% src="https://wac-cdn.atlassian.com/dam/jcr:1523084b-d05a-4f5a-bd1a-01866ec09ca3/01%20A%20forked%20commit%20history.svg?cdnVersion=447">
<p>In VS code there is a "Pull (rebase)" command accessed from the "Push, Pull" option in the pull-down menu "..." in the SOURCE CONTROL window. Use that instead of the "Pull" option which is more obvious.
<p>In VS code there is a "Pull (rebase)" command accessed from the "Push, Pull" option in the pull-down menu "..." in the <small>SOURCE CONTROL</small> window. Use that instead of the "Pull" option which is more obvious.
<h3>Using git</h3>
<p>In Git, there are five places your source can exist: <ul>