From 4a4db0b849f7a5a558d8b6611f5457ae9897a48f Mon Sep 17 00:00:00 2001 From: Dimitrios Theodorakis Date: Tue, 19 Nov 2024 17:01:08 +0000 Subject: [PATCH] Fixes the zip file and updates the instructor setup to inlcude creating a ruleset to protect main --- instructors/data/git-training-demo.zip | Bin 5468 -> 5274 bytes instructors/instructor-notes.md | 2 ++ 2 files changed, 2 insertions(+) diff --git a/instructors/data/git-training-demo.zip b/instructors/data/git-training-demo.zip index 29cf6343ac686c0d7651272718d1db5c16c4ead9..3d9cb2940f6f9b283043cb0b6cbdb3305d9e5d6b 100644 GIT binary patch delta 129 zcmcbkHA|Bxz?+$civa|_w@u{HWD`7WlYa2<JPNl)B0v0r;)n)+lGe&LA=0w5I2!j50|UzoW(I};Z&o(2{U}6$HzSiAGt6O=);&x587Z%^Vj{gSBA!3K+IA lNWhI)(ip%$d7_Z0A=q+Oh~+pe=4Iezn83=wu#F$29RTp(Kd1lz diff --git a/instructors/instructor-notes.md b/instructors/instructor-notes.md index c2eb5b0..cf54d6e 100644 --- a/instructors/instructor-notes.md +++ b/instructors/instructor-notes.md @@ -21,6 +21,8 @@ your organisation. name `git-training-demo`. 7. Link your local repo to the remote and push all changes. +8. Setup a rule to require a PR before + merging with `main`. Pay particular attention to the instructor callouts in episodes [05](../episodes/05-forks.md)