Skip to content

Commit 70e55d5

Browse files
committed
Add template text for VS Code
1 parent 5496b35 commit 70e55d5

File tree

4 files changed

+60
-3
lines changed

4 files changed

+60
-3
lines changed

website/docs/sas-tools/1_CloneStudioViya.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ It is a good practice to stage one program at a time to provide an appropriate c
3636
6. Click **Push Main** to push the commits to your personal remote repository in GitHub.
3737
7. Return to your forked copy of the repository on GitHub.com and refresh the page to verify the changes have been synced.
3838

39-
## Merge changes into public repository
39+
## Merge changes into main repository
4040
At any point you can request to merge your personal repository changes with the official public repository. In GitHub, this is called a Pull Request (PR).
4141
1. Refresh the GitHub page for your personal forked repository. The following message indicates that you have updates in your branch that are not year in the public repository. <img width="758" height="100" alt="image" src="https://github.com/user-attachments/assets/15299b74-3db3-4283-a4e7-728ca899647f" />
4242
1. Select **Contribute** > **Open pull request**.

website/docs/sas-tools/2_CloneStudioSAS9.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ It is a good practice to stage one program at a time to provide an appropriate c
4141
6. Click **Push Main** to push the commits to your personal remote repository in GitHub.
4242
7. Return to your forked copy of the repository on GitHub.com and refresh the page to verify the changes have been synced.
4343

44-
## Merge changes into public repository
44+
## Merge changes into main repository
4545
At any point you can request to merge your personal repository changes with the official public repository. In GitHub, this is called a Pull Request (PR).
4646
1. Refresh the GitHub page for your personal forked repository. The following message indicates that you have updates in your branch that are not year in the public repository. <img width="758" height="100" alt="image" src="https://github.com/user-attachments/assets/15299b74-3db3-4283-a4e7-728ca899647f" />
4747
1. Select **Contribute** > **Open pull request**.

website/docs/sas-tools/3_CloneEG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ It is a good practice to stage one program at a time to provide an appropriate c
4040
6. Click **Push** to push the commits to your personal remote repository in GitHub.
4141
7. Return to your forked copy of the repository on GitHub.com and refresh the page to verify the changes have been synced.
4242

43-
## Merge changes into public repository
43+
## Merge changes into main repository
4444
At any point you can request to merge your personal repository changes with the official public repository. In GitHub, this is called a Pull Request (PR).
4545
1. Refresh the GitHub page for your personal forked repository. The following message indicates that you have updates in your branch that are not year in the public repository. <img width="758" height="100" alt="image" src="https://github.com/user-attachments/assets/15299b74-3db3-4283-a4e7-728ca899647f" />
4646
1. Select **Contribute** > **Open pull request**.

website/docs/sas-tools/4_CloneVSCode.md

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,60 @@
22
sidebar_position: 4
33
---
44
# Using the Repository with the SAS Extension for Visual Studio Code
5+
## Create a forked copy of sas-code-examples
6+
1. If you do not have a profile in GitHub, visit [https://github.com/signup](https://github.com/signup). Create an account with your email and a username of your choice.
7+
2. Access the public [sas-code-examples repository](https://github.com/sassoftware/sas-code-examples).
8+
3. Click the down arrow next to **Fork** and select **Create a new fork**.
9+
4. It may be helpful to add a prefix to the repository name to distinguish it from the main repository, for example: `name-sas-code-examples`. The branch name cannot include spaces. Click **Create fork**.
10+
5. Confirm you are working in your branch, which is a personal copy of the repository.
11+
12+
## Create a Git Profile in SAS Studio
13+
14+
15+
## Clone the repository in VS Code
16+
1. In your forked repository on GitHub.com, select the green **Code** button. On the **Local** tab, select either **SSH** or **HTTPS** depending on your authentication method. Select <img width="12" height="14" alt="Copy (2)" src="https://github.com/user-attachments/assets/18939792-199e-4bf5-aaa9-7d888cee73fe" />
17+
(Copy) to copy the repository reference.
18+
2. Return to VS Code.
19+
20+
## Create/modify programs and update personal repository
21+
1. In SAS Studio, click <img width="12" height="14" alt="Server" src="https://github.com/user-attachments/assets/2372856a-165c-48c6-90d0-b96c069c1c48" /> in the left pane to open the **Explorer** or **SAS Server**. Navigate to `sas-code-examples` folder where you cloned your personal forked version of the repository.
22+
2. You can open existing programs, make modifications, and save changes – just as you would any other local files. You can also add new programs. Any changes you make are saved only in your local repository.
23+
3. Select <img width="12" height="14" alt="GitRepository" src="https://github.com/user-attachments/assets/0fec2580-827d-475d-87dc-23ec269d124f" /> (**Git Repositories**) and double-click `sas-code-examples` to open the repository in a tab. Any programs that have been modified or created will be listed in the _Unstaged Changes_ list. Select one or more programs from the list and use the down arrow icons to move them to the _Staged Changes_.
24+
4. View the program on the right to examine highlighted portions of the code that have been added or removed.
25+
5. Type a message in the **Commit Comment** box that describes the modifications made to the program(s), then click **Commit**.
26+
27+
:::tip
28+
29+
It is a good practice to stage one program at a time to provide an appropriate comment for the new commit. Only commit multiple programs at once if a single comment applies to all changes.
30+
31+
:::
32+
33+
6. Click **Push Main** to push the commits to your personal remote repository in GitHub.
34+
7. Return to your forked copy of the repository on GitHub.com and refresh the page to verify the changes have been synced.
35+
36+
## Merge changes into main repository
37+
At any point you can request to merge your personal repository changes with the official public repository. In GitHub, this is called a Pull Request (PR).
38+
1. Refresh the GitHub page for your personal forked repository. The following message indicates that you have updates in your branch that are not year in the public repository. <img width="758" height="100" alt="image" src="https://github.com/user-attachments/assets/15299b74-3db3-4283-a4e7-728ca899647f" />
39+
1. Select **Contribute** > **Open pull request**.
40+
2. You may provide a description to explain the changes made. Your request will be reviewed to verify all contribution rules are followed and that there are no conflicts with other updates.
41+
42+
:::warning
43+
44+
Your contribution must meet the project's contribution guidelines. See `CONTRIBUTING.md` for details. The last line in the PR description must be the following text: `Signed-off-by: Name <email.address>`.
45+
46+
:::
47+
48+
3. Click **Create pull request**. You will likely see the following message, which can be ignored: <img width="509" height="198" alt="image" src="https://github.com/user-attachments/assets/73d765b2-b15d-450f-97ef-d9223a2c97bd" />
49+
4. The PR will go to the repository maintainers for approval. If there are issues with your requested changes, you may be asked in the comments of the PR to make further edits and recommit your file(s).
50+
5. Once all changes are approved, they will be merged into the main repository. You will see the following message in your PR: <img width="561" height="144" alt="image" src="https://github.com/user-attachments/assets/e41b8172-9397-49f4-8acd-7a090e32aefb" />
51+
52+
## Keep personal fork in sync with main project repository
53+
:::tip
54+
55+
You can continue to work with the same personal fork of the repository for future updates; however, it is very important to keep it in sync with the main project repository. This will help to avoid conflicts when making pull requests.
56+
57+
:::
58+
59+
1. In GitHub.com, check your branch for the following message that indicates there are updates in the public repository that have not been synced with your branch: <img width="737" height="94" alt="image" src="https://github.com/user-attachments/assets/6d54920f-8b14-41be-83c9-40ca98ad7925" />
60+
2. Click **Sync fork** > **Update branch**. This will update your branch stored in GitHub.
61+
3. In SAS Studio, select <img width="12" height="14" alt="GitRepository" src="https://github.com/user-attachments/assets/6aad0af8-65ca-452c-b96f-7d8886a030ad" /> (**Git Repositories**) and open your cloned `sas-code-examples` repository. Then click **Pull** to sync your local files with the remote repository.

0 commit comments

Comments
 (0)