... | ... | @@ -11,26 +11,33 @@ dfsg |
|
|
master
|
|
|
|
|
|
First fetch the changes to upstream from upstream remote
|
|
|
|
|
|
`git fetch upstream master`
|
|
|
|
|
|
Merge the changes to swecha\upstream branch
|
|
|
|
|
|
```git checkout upstream
|
|
|
git merge
|
|
|
```
|
|
|
`git checkout upstream`
|
|
|
|
|
|
`git merge`
|
|
|
|
|
|
then merge the upstream changes to dfsg
|
|
|
```git checkout dfsg
|
|
|
git merge upstream
|
|
|
```
|
|
|
|
|
|
`git checkout dfsg`
|
|
|
|
|
|
`git merge upstream`
|
|
|
|
|
|
then add a tag to dfsg
|
|
|
|
|
|
`git tag upstream/1.2+20170920+git50f9f23f+dfsg1`
|
|
|
|
|
|
change the commit number to the upstream commit number and date
|
|
|
|
|
|
merge changes to master
|
|
|
|
|
|
`git checkout master`
|
|
|
|
|
|
`git merge dfsg`
|
|
|
|
|
|
change the changelog, update the version number date
|
|
|
|
|
|
build the package |
|
|
\ No newline at end of file |