diff --git a/2019/2019-09-09_testCourseAdv/slides/chPickIntro.md b/2019/2019-09-09_testCourseAdv/slides/chPickIntro.md new file mode 100644 index 0000000000000000000000000000000000000000..8dda23928016c84f0b955a19dc62c53d763c7aca --- /dev/null +++ b/2019/2019-09-09_testCourseAdv/slides/chPickIntro.md @@ -0,0 +1,11 @@ +## Cherry picking commits + +Cherry picking is another very useful tool to work with. +It enables the user to pick very specific commits from a +list of commits to select which changes are needed and +which ones aren't. + +Note: Cherry picking only picks the selected commit, +not everything up to that commit. If a commit is dependant +on other changes introduced before, these changes have to be +cherry picked as well to avoid conflicts. \ No newline at end of file diff --git a/2019/2019-09-09_testCourseAdv/slides/list.json b/2019/2019-09-09_testCourseAdv/slides/list.json index 9a7d28892dcc3ed971aacf1047478f9a0956bd1b..4e929e2fdfaa42b196b24282f2f43620a9c1be00 100644 --- a/2019/2019-09-09_testCourseAdv/slides/list.json +++ b/2019/2019-09-09_testCourseAdv/slides/list.json @@ -24,6 +24,11 @@ "attr": { } }, + { + "filename": "chPickIntro.md", + "attr": { + } + }, { "filename": "thanks.md", "attr": {