From 513ba7ad6e5e3fce17bf1db43e42fcbee6aac74a Mon Sep 17 00:00:00 2001 From: Daniel Duarte Tojal <daniel.duarte.001@student.uni.lu> Date: Fri, 23 Aug 2019 13:49:31 +0200 Subject: [PATCH] streamline slides --- 2019/2019-09-09_testCourseAdv/slides/rebaseExample.md | 5 ++--- 2019/2019-09-09_testCourseAdv/slides/rebaseIntro.md | 5 +++-- 2019/2019-09-09_testCourseAdv/slides/rebasePresentation.md | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/2019/2019-09-09_testCourseAdv/slides/rebaseExample.md b/2019/2019-09-09_testCourseAdv/slides/rebaseExample.md index bd580b16..eb650649 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 79058533..89454e0b 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 885dd424..ef4e1f06 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 -- GitLab