瀏覽代碼

Merge pull request #2049 from gui-cs/main

Merge main into develop post Release v1.8.0
Tig Kindel 2 年之前
父節點
當前提交
59ed807836
共有 1 個文件被更改,包括 12 次插入1 次删除
  1. 12 1
      Terminal.Gui/README.md

+ 12 - 1
Terminal.Gui/README.md

@@ -87,13 +87,15 @@ git push
 ### 5) Pull the merged `develop` from `upstream`
 ### 5) Pull the merged `develop` from `upstream`
 
 
 ```powershell
 ```powershell
-git pull upstream `develop`
+git checkout develop
+git pull upstream develop
 ```
 ```
 
 
 ### 6) Merge `develop` into `main`
 ### 6) Merge `develop` into `main`
 
 
 ```powershell
 ```powershell
 git checkout main
 git checkout main
+git pull upstream main
 git merge develop
 git merge develop
 ```
 ```
 
 
@@ -122,6 +124,15 @@ https://www.nuget.org/packages/Terminal.Gui
 
 
 ### 12) Tweet about it
 ### 12) Tweet about it
 
 
+### 13) Update the `develop` branch
+
+```powershell
+git checkout develop
+git pull upstream develop
+git merge main
+git push upstream develop
+```
+
 ## Nuget
 ## Nuget
 
 
 https://www.nuget.org/packages/Terminal.Gui
 https://www.nuget.org/packages/Terminal.Gui