mirror of
https://github.com/Kozea/Radicale.git
synced 2025-09-15 20:36:55 +00:00
update related to rebase v3
parent
8be3aa2508
commit
178a15b6d5
1 changed files with 12 additions and 5 deletions
|
@ -79,19 +79,19 @@ tox
|
|||
|
||||
Commit changes
|
||||
|
||||
```
|
||||
```bash
|
||||
git commit -a
|
||||
```
|
||||
|
||||
Create release tag
|
||||
|
||||
```
|
||||
```bash
|
||||
git tag v$VERSION
|
||||
```
|
||||
|
||||
Push
|
||||
|
||||
```
|
||||
```bash
|
||||
git push
|
||||
git push --tags
|
||||
```
|
||||
|
@ -113,6 +113,13 @@ After RPMs are successfully built, mark it as latest release
|
|||
|
||||
* Rebase major version branch (currently "v3") with "master"
|
||||
|
||||
```bash
|
||||
git checkout v3
|
||||
git rebase master
|
||||
git push
|
||||
git checkout master
|
||||
```
|
||||
|
||||
## Turn back master to devel
|
||||
|
||||
| File | Action |
|
||||
|
@ -123,12 +130,12 @@ After RPMs are successfully built, mark it as latest release
|
|||
|
||||
Commit changes
|
||||
|
||||
```
|
||||
```bash
|
||||
git commit -a
|
||||
```
|
||||
|
||||
Push
|
||||
|
||||
```
|
||||
```bash
|
||||
git push
|
||||
```
|
Loading…
Add table
Add a link
Reference in a new issue