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

fix spacing/typos

parent 2f02bd1c
No related branches found
No related tags found
No related merge requests found
......@@ -2,7 +2,7 @@
```bash
git rebase -i <branch>
````
```
* Enables more precise control over the rebased commits
* Before committing many actions are at disposal
\ No newline at end of file
## Interactive Rebase Workshop
* Perform an interactive rebase onto the master branch
* Perform an interactive rebase onto the master branch
```bash
git rebase -i master
......
## Rebasing
* 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.
**image showing master branch and branch A, but master went ahead, but commits are shown**
\ No newline at end of file
## Rebasing
* Git rebase is a great and handy tool
* Straightens the workflow
* Avoid discrepancies when multiple people work on the same project
* Git rebase is a great and handy tool
* Straightens the workflow
* Avoid discrepancies when multiple people work on the same project
Imagine the following situation:
Imagine the following situation:
**image showing master branch and branch A, but master went ahead**
\ No newline at end of file
......@@ -5,6 +5,6 @@ If we're on the develop branch, we can use
git rebase master
```
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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment