|
|
@ -29,10 +29,13 @@ gitGraph TB:
|
|
|
|
commit
|
|
|
|
commit
|
|
|
|
checkout feature/price_manager
|
|
|
|
checkout feature/price_manager
|
|
|
|
commit
|
|
|
|
commit
|
|
|
|
commit
|
|
|
|
commit id: "完成价格"
|
|
|
|
checkout main
|
|
|
|
checkout main
|
|
|
|
commit tag: "1.1.0" id: "完成机票"
|
|
|
|
commit tag: "1.1.0" id: "完成机票"
|
|
|
|
merge feature/price_manager id: "完成价格" tag: "1.2.0"
|
|
|
|
branch pre-release
|
|
|
|
|
|
|
|
merge feature/price_manager id: "合并机票+价格"
|
|
|
|
|
|
|
|
checkout main
|
|
|
|
|
|
|
|
merge pre-release id: "合并发布" tag: "1.2.0"
|
|
|
|
commit
|
|
|
|
commit
|
|
|
|
|
|
|
|
|
|
|
|
```
|
|
|
|
```
|
|
|
|