diff --git a/handbook/computing/qstart-git.html b/handbook/computing/qstart-git.html index f1e344723..395fbf40e 100644 --- a/handbook/computing/qstart-git.html +++ b/handbook/computing/qstart-git.html @@ -45,6 +45,8 @@ than git pull; which is equivalent to git fetch; git merge 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. +

See nice explanantion at Merging vs. Rebasing: "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.." +

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.

Using git