Skip to content

Commit ad8788e

Browse files
committedApr 8, 2025·
Updated docs
1 parent 50c83a4 commit ad8788e

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed
 

‎docs/testing.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ The following is a testing plan that should be followed prior to release of a ne
1818
- Add, edit, and delete items through Studio / VS Code. Use the Sync option. All changes should be committed and pushed to the remote.
1919
- Add, edit, and delete items on the remote. Add, edit, and delete unrelated items through Studio/VSCode. All changes should be pulled, committed, and pushed.
2020
- Add an item to an interoperability production and sync. Check out a new feature branch. The item should no longer exist in the production. Set the previous branch as the remote merge branch. Sync. The new item should exist in the production.
21-
- Add an item to a production and sync. Check out a new feature branch. The item should no longer exist in the production. Set the previous branch as the remote merge branch. Add a new item to the production. Sync. The production should now have both new items, and the source control output should show it automatically resolved a conflict.
21+
- Make sure production decomposition is off. Add an item to a production and sync. Check out a new feature branch. The item should no longer exist in the production. Set the previous branch as the remote merge branch. Add a new item to the production. Sync. The production should now have both new items, and the source control output should show it automatically resolved a conflict.
2222

2323
## Testing production decomposition
2424
- Enable production decomposition in the git-source-control settings.

0 commit comments

Comments
 (0)
Please sign in to comment.