Skip to content

Commit b3aea54

Browse files
committed
Remove section 3 slide: 'Merging the Feature In'
The first task in section 4 is a code review exercise, which instructs the students to open a pull request on GitHub. However, this slide at the end of section 3 instructs the students to merge their changes into develop locally. This caused some confusion last time I ran this, as the students had no existing changes to make a pull request from!
1 parent 8f568c8 commit b3aea54

1 file changed

Lines changed: 0 additions & 14 deletions

File tree

slides/section_3_software_dev_process.md

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -855,20 +855,6 @@ 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-
872858
<!-- #region slideshow={"slide_type": "subslide"} editable=true -->
873859
### Controller Structure
874860

0 commit comments

Comments
 (0)