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

add link to explanatory article and image - online edit of handbook/computing/qstart-git.html

Browse Source
This commit is contained in:
Philip Sargent 2022-07-23 13:04:11 +01:00
parent aef56dd157
commit 11673c6e82
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,6 +45,8 @@ than
<tt>git pull;</tt> which is equivalent to <tt>git fetch; git merge</tt>
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" 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.
<h3>Using git</h3>