Updated Branching and Merging (markdown)
parent
864e73b5c6
commit
c2cd9bb2f3
1 changed files with 3 additions and 0 deletions
|
@ -44,6 +44,9 @@ git rebase origin/master
|
||||||
git checkout master
|
git checkout master
|
||||||
git pull
|
git pull
|
||||||
git merge --no-ff your_branch_name
|
git merge --no-ff your_branch_name
|
||||||
|
# assuming everything went well...
|
||||||
|
git push
|
||||||
|
git push --delete origin your_branch_name
|
||||||
```
|
```
|
||||||
|
|
||||||
## Example
|
## Example
|
||||||
|
|
Loading…
Reference in a new issue