From efb062d049733c14b74b39e371c7c78c54c50abd Mon Sep 17 00:00:00 2001 From: Daniel Duarte Tojal <daniel.duarte.001@student.uni.lu> Date: Wed, 28 Aug 2019 09:21:29 +0200 Subject: [PATCH] update chPick pres1 --- .../slides/chPickPresentation.md | 12 ------------ .../slides/chPickPresentation1.md | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 2019/2019-09-09_testCourseAdv/slides/chPickPresentation.md create mode 100644 2019/2019-09-09_testCourseAdv/slides/chPickPresentation1.md 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 d334a11f..00000000 --- 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 00000000..d3b3549b --- /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 -- GitLab