diff --git a/2019/2019-09-09_testCourseAdv/slides/rebaseExample.md b/2019/2019-09-09_testCourseAdv/slides/rebaseExample.md index bd580b16eb2d6f1321c0ec8028fab3cad8b1922c..eb650649095b80c736ab8074ed64f20188a79add 100644 --- a/2019/2019-09-09_testCourseAdv/slides/rebaseExample.md +++ b/2019/2019-09-09_testCourseAdv/slides/rebaseExample.md @@ -1,7 +1,6 @@ ## Rebasing -Develop branch is several commits ahead of master, -but there have been commits implemented into master -that aren't in develop. +* Develop branch is several commits ahead of master. +* commits implemented into master that aren't in develop. **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/rebaseIntro.md b/2019/2019-09-09_testCourseAdv/slides/rebaseIntro.md index 7905853375fb06478da852e673007971429209d1..89454e0b588cefa7333733d75ef45835f15a2dcb 100644 --- a/2019/2019-09-09_testCourseAdv/slides/rebaseIntro.md +++ b/2019/2019-09-09_testCourseAdv/slides/rebaseIntro.md @@ -1,7 +1,8 @@ ## Rebasing -Git rebasing is a powerful tool that helps straightening the workflow -and avoid version discrepancies between the different branches. +* Git rebase is a powerful tool +* Straightens the workflow +* Avoid discrepancies when multiple people work on the same project Imagine the following situation: diff --git a/2019/2019-09-09_testCourseAdv/slides/rebasePresentation.md b/2019/2019-09-09_testCourseAdv/slides/rebasePresentation.md index 885dd4249ffa2e5b860abade344493deaf1f0258..ef4e1f06254ac1c48378232fcd7a94855e420606 100644 --- a/2019/2019-09-09_testCourseAdv/slides/rebasePresentation.md +++ b/2019/2019-09-09_testCourseAdv/slides/rebasePresentation.md @@ -5,6 +5,6 @@ If we're on the develop branch, we can use git rebase master ``` -And this will move the develop branch forward to match master's current state. +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