Skip to content

Commit afe2a42

Browse files
authored
Merge pull request #567 from intersystems/document-add
Clarify documentation about adding items to source control
2 parents 4d9f22f + 8685cb8 commit afe2a42

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ The same right click menus as in Studio live under "Server Source Control..." wh
4848
4949
Note: Studio has been deprecated. VSCode is the IDE recommended by InterSystems.
5050
51-
Add a file for tracking by right-clicking on it in the workspace/project view and choosing Git > Add.
51+
Add an existing file for tracking by right-clicking on it in the workspace/project view and choosing Git > Add.
5252
This same menu also has options to remove (stop tracking the file), discard changes (revert to the index), or commit changes.
5353
5454
You can browse file history and commit changes through a user interface launched from the top level Git > "Launch Git UI" menu item. There is also a page for configuring settings.

docs/hcc.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ You will be prompted to enter a name for your new branch (no spaces or special c
1616

1717
### Making Changes
1818

19-
Now that you are in your new branch (you can see your current branch in the first item in the source control menu), you can start making changes. As you make changes to different business processes, rules, and productions, make sure that all of these changes are saved properly and any new items are added to source control (via the "Add" menu item) before you continue to sync and merge.
19+
Now that you are in your new branch (you can see your current branch in the first item in the source control menu), you can start making changes. As you make changes to different business processes, rules, and productions, make sure that all of these changes are saved properly before you continue to sync and merge.
2020

2121
### Syncing and Merge Requests
2222

docs/testing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ The following is a testing plan that should be followed prior to release of a ne
77
- Use VS Code to create a new class. Use the Source Control menu to Import All from the repository. Check the output to confirm that the contents of the repository were imported and compiled.
88
- Test changing Git project settings in a web browser and in Studio. Input labels and tooltips should describe each setting.
99
- In Expert Mode, test:
10-
- Add a new item through Studio / VS Code. Use the Add option in the Source Control Menu. The item should show up in the Workspace view of the WebUI.
10+
- Add a new item through Studio / VS Code. View the Source Control Menu - there should be an option to remove it from source control. The item should show up in the Workspace view of the WebUI.
1111
- Stash the item in the WebUI. It should be deleted from IRIS. Pop it from the stash. It should be imported and compiled. Discard the item in the WebUI. It should be deleted from IRIS.
1212
- Add, delete, and modify some items in Studio / VS Code. Commit through the WebUI with a commit message and details. The commit should show with the expected commit message and differences in the branch view.
1313
- Select the branch in the branch view and click "Push Branch". It should successfully push changes to the remote repository.

0 commit comments

Comments
 (0)