Closed tobin-ford closed 6 months ago
@tobin-ford - merge either the development
branch or Kempe_standoff_PR
branch into your Monte Carlo branch. That should take care of this issue.
You can do the merge in VSCode. Make sure you have your Monte Carlo branch checked out. Then got to Source Control
, click on the three dots next to your branch name. In the dropdown menu go to Branch
-> Merge branch...
-> select one of the mentioned branches. This should take care of it.
if you get merge conflicts, you can look up how to resolve them here https://code.visualstudio.com/docs/sourcecontrol/overview
@tobin-ford - I think this can be closed?
Standoff tutorial notebook will break post merge, Kempe_Standoff -> main and dev_montecarlo -> main