From 32ddf22dfefa5a4bd41c198746ca4c64b80d0d4b Mon Sep 17 00:00:00 2001
From: Daniel Duarte Tojal <daniel.duarte.001@student.uni.lu>
Date: Fri, 23 Aug 2019 12:19:07 +0200
Subject: [PATCH] changed branch names

---
 .../slides/chPickPresentation.md                       | 10 +++++-----
 2019/2019-09-09_testCourseAdv/slides/rebaseExample.md  |  6 +++---
 .../slides/rebasePresentation.md                       |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/2019/2019-09-09_testCourseAdv/slides/chPickPresentation.md b/2019/2019-09-09_testCourseAdv/slides/chPickPresentation.md
index 9fcad458..d334a11f 100644
--- a/2019/2019-09-09_testCourseAdv/slides/chPickPresentation.md
+++ b/2019/2019-09-09_testCourseAdv/slides/chPickPresentation.md
@@ -1,12 +1,12 @@
 ## Cherry Picking Commits
 
-Let's take our branch A and say it has a row of commits.  
-If only certain of these commits are important for a  
-second branch B, using the command  
+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 A and merge them  
-into B
\ No newline at end of file
+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/rebaseExample.md b/2019/2019-09-09_testCourseAdv/slides/rebaseExample.md
index 8ca9fcc3..8c54c4f7 100644
--- a/2019/2019-09-09_testCourseAdv/slides/rebaseExample.md
+++ b/2019/2019-09-09_testCourseAdv/slides/rebaseExample.md
@@ -1,8 +1,8 @@
 ## Rebasing
 
-Branch A is several commits ahead of master,  
+Branch develop is several commits ahead of master,  
 but there have been commits implemented into master  
-that aren't in A because A was created before these  
-implementations
+that aren't in develop because the develop branch was  
+created before these implementations.  
 
 **image showing master branch and branch A, but master went ahead, but commits are shown**
\ No newline at end of file
diff --git a/2019/2019-09-09_testCourseAdv/slides/rebasePresentation.md b/2019/2019-09-09_testCourseAdv/slides/rebasePresentation.md
index e49701a4..885dd424 100644
--- a/2019/2019-09-09_testCourseAdv/slides/rebasePresentation.md
+++ b/2019/2019-09-09_testCourseAdv/slides/rebasePresentation.md
@@ -1,10 +1,10 @@
 ## Rebasing
 
-If we're on the A branch, we can use  
+If we're on the develop branch, we can use  
 ```bash
 git rebase master
 ```
 
-And this will move the A branch forward to match master's current state.
+And this will move the develop branch forward to match master's current state.
 
 **image showing master branch and branch A, branch A now being on the HEAD of master**
\ No newline at end of file
-- 
GitLab