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

split mergePres into two slides

parent d2e4e0e8
No related branches found
No related tags found
No related merge requests found
......@@ -125,7 +125,12 @@
}
},
{
"filename": "mergePresentation.md",
"filename": "mergePresentation1.md",
"attr": {
}
},
{
"filename": "mergePresentation2.md",
"attr": {
}
},
......
# Practical: Merging branches
* Check the commit log of the myBranch and Feature1 branch
```bash
$ git log
```
* Go to myBranch and merge the Feature1 branch into it
```bash
$ git merge Feature1
```
* This will move all changes made in the Feature1 branch
onto myBranch, effectively fusing the two together.
\ 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