... | ... | @@ -37,4 +37,28 @@ Merge into the master branch |
|
|
git checkout master
|
|
|
git merge mastersvn
|
|
|
git push
|
|
|
``` |
|
|
\ No newline at end of file |
|
|
```
|
|
|
|
|
|
### Loop
|
|
|
|
|
|
```sh
|
|
|
git checkout master
|
|
|
git pull
|
|
|
```
|
|
|
|
|
|
```sh
|
|
|
git checkout mastersvn
|
|
|
git pull
|
|
|
```
|
|
|
|
|
|
```sh
|
|
|
git svn fetch
|
|
|
git svn rebase
|
|
|
git push
|
|
|
```
|
|
|
|
|
|
```sh
|
|
|
git checkout master
|
|
|
git merge mastersvn
|
|
|
git push
|
|
|
``` |