Updated Branching and Merging (markdown)

Alex Grin 2018-02-23 11:24:10 -05:00
parent 864e73b5c6
commit c2cd9bb2f3

@ -44,6 +44,9 @@ git rebase origin/master
git checkout master
git pull
git merge --no-ff your_branch_name
# assuming everything went well...
git push
git push --delete origin your_branch_name
```
## Example