Skip to content
Snippets Groups Projects
Commit d5f04013 authored by Daniel Duarte's avatar Daniel Duarte
Browse files

add images to text * need fixing

parent a0bf31f8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
2019/2019-09-09_testCourseAdv/slides/rebaseExample.md
+ 1
− 1
View file @ d5f04013
...@@ -3,4 +3,4 @@ ...@@ -3,4 +3,4 @@
* Develop branch is several commits ahead of master. * Develop branch is several commits ahead of master.
* Commits implemented into master that aren't in develop. * Commits implemented into master that aren't in develop.
**image showing master branch and branch A, but master went ahead, but commits are shown** ! [] (slides/img/afterRebase.png)
\ No newline at end of file \ No newline at end of file
2019/2019-09-09_testCourseAdv/slides/rebaseIntro.md
+ 2
− 1
View file @ d5f04013
...@@ -4,4 +4,5 @@ ...@@ -4,4 +4,5 @@
* Straightens the workflow * Straightens the workflow
* Avoid discrepancies when multiple people work on the same project * Avoid discrepancies when multiple people work on the same project
Imagine the following situation: Imagine the following situation:
\ No newline at end of file ! [] (slides/img/beforeRebase.png)
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment