Works in My Environment! | Documentation for the Delphix Toolchain Workshop

Now that we validated our changes worked in our development environment, it is time for us to merge our feature branch to promote our changes along.

Launch VS Code, bring it to the foreground, and click on the Explorer Button (in yellow square, below)
Click the sync icon across the bottom (in yellow square, below) OR by using the more actions menu and selecting pull
Note: DO NOT SKIP THIS STEP
Click ‘OK’ if you are prompted to confirm.
Click on develop in the checkout menu (in yellow rectangle) and select master (in purple oval).
In the View menu, select the Command Palette (or use CTRL+SHIFT+P).
Type merge branch in the dialog box
Select develop in the Select a branch to merge from dialog box
Click the sync icon across the bottom (in yellow square, below) OR by using the more actions menu and selecting push
Click ‘OK’ if you are prompted to confirm.

Go back to our ssh terminal and enter git pull This will ensure we have all the latest changes to our feature branch
Note: DO NOT SKIP THIS STEP
Enter git checkout master
Enter git merge develop
Enter git push
You should see some output return in your console with master -> master at the bottom.