Skip to content

Commit 6eef578

Browse files
committed
Revert "Remove section 3 slide: 'Merging the Feature In'"
This reverts commit b3aea54.
1 parent b3aea54 commit 6eef578

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

slides/section_3_software_dev_process.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -855,6 +855,20 @@ Time: 10min
855855

856856
<!-- #endregion -->
857857

858+
<!-- #region slideshow={"slide_type": "subslide"} editable=true -->
859+
### Merge the Feature In
860+
861+
Hopefully you have now refactored the feature to conform to our MVC structure, and ran our regression tests to check that the outputs rermain the same.
862+
863+
We can commit this to our branch, and then switch to the `develop` branch and merge it in.
864+
865+
```bash
866+
$ git switch develop
867+
$ git merge full-data-analysis
868+
```
869+
870+
<!-- #endregion -->
871+
858872
<!-- #region slideshow={"slide_type": "subslide"} editable=true -->
859873
### Controller Structure
860874

0 commit comments

Comments
 (0)