diff --git a/2019/2019-09-09_testCourseAdv/slides/chPickPresentation.md b/2019/2019-09-09_testCourseAdv/slides/chPickPresentation.md deleted file mode 100644 index d334a11f03dcc084ebcb199665cf784544c1531f..0000000000000000000000000000000000000000 --- a/2019/2019-09-09_testCourseAdv/slides/chPickPresentation.md +++ /dev/null @@ -1,12 +0,0 @@ -## Cherry Picking Commits - -Let's take our develop branch and say it has a row of commits. -If only certain of these commits are important for the master -branch, using the command - -```bash -git cherry-pick ZZ -``` - -we can take only the relevant changes from develop and merge them -into master. \ No newline at end of file diff --git a/2019/2019-09-09_testCourseAdv/slides/chPickPresentation1.md b/2019/2019-09-09_testCourseAdv/slides/chPickPresentation1.md new file mode 100644 index 0000000000000000000000000000000000000000..d3b3549b06de0951b6e8af50f9aa9c72bfd2f6e8 --- /dev/null +++ b/2019/2019-09-09_testCourseAdv/slides/chPickPresentation1.md @@ -0,0 +1,12 @@ +## Cherry Picking Workshop + +* In your branch, create a reference file +```bash +$ echo "This is the start of a commit chain" > reference.txt +``` + +* Create two files in the develop branch +```bash +$ echo "This is a commit to keep" > keep.txt +$ echo "Ignore this commit" > ignore.txt +``` \ No newline at end of file