File tree 1 file changed +9
-3
lines changed
1 file changed +9
-3
lines changed Original file line number Diff line number Diff line change @@ -15,8 +15,14 @@ upstream https://github.com/pydata/xarray (push)
15
15
16
16
1 . Ensure your master branch is synced to upstream:
17
17
``` sh
18
+ git switch master
18
19
git pull upstream master
19
20
```
21
+ 2. Confirm there are no commits on stable that are not yet merged
22
+ ([ref](https://github.com/pydata/xarray/pull/4440)):
23
+ ` ` ` sh
24
+ git merge upstream stable
25
+ ` ` `
20
26
2. Add a list of contributors with:
21
27
` ` ` sh
22
28
git log " $( git tag --sort=" v:refname" | sed -n ' x;$p' ) .." --format=%aN | sort -u | perl -pe ' s/\n/$1, /'
@@ -81,12 +87,12 @@ upstream https://github.com/pydata/xarray (push)
81
87
```
82
88
15. Update the stable branch (used by ReadTheDocs) and switch back to master:
83
89
```sh
84
- git checkout stable
90
+ git switch stable
85
91
git rebase master
86
92
git push --force upstream stable
87
- git checkout master
93
+ git switch master
88
94
```
89
- It' s OK to force push to ' stable' if necessary. (We also update the stable
95
+ It' s OK to force push to ` stable` if necessary. (We also update the stable
90
96
branch with ` git cherry-pick` for documentation only fixes that apply the
91
97
current released version.)
92
98
16. Add a section for the next release {0.X.Y+1} to doc/whats-new.rst:
You can’t perform that action at this time.
0 commit comments