From e6a91907470912f322a4ca29696b8bff95f4c782 Mon Sep 17 00:00:00 2001 From: Richard Darst Date: Fri, 8 Mar 2024 02:50:17 +0200 Subject: [PATCH] minor text updates --- content/local-workflow.md | 5 +++-- content/reference.md | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/content/local-workflow.md b/content/local-workflow.md index ff877ab3..f1718fb0 100644 --- a/content/local-workflow.md +++ b/content/local-workflow.md @@ -39,9 +39,10 @@ do, so now we move to working on your own computer. ## Basics -- What is VS Code and command line +- What is VS Code and what is the command line? +- How to choose. - Command line still needed sometimes in VS Code. Show how it can be - accessed. + accessed (for the most part you just paste in what you need). diff --git a/content/reference.md b/content/reference.md index ee6a51da..a87f245b 100644 --- a/content/reference.md +++ b/content/reference.md @@ -73,6 +73,13 @@ pull request into another. Usually used to contribute code back to {term}`upstream`. +push + Moving changes from your local copy to another copy + +pull + Getting changes from another copy to your own copy. `git pull` + does this fetch, and also tries to automatically merge. + master Default name for main branch on Git. Depending on the configuration and service, the default branch is sometimes **main**.