File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -71,10 +71,10 @@ Pretend `3.8` was the last version of pure-docker release (look for the latest `
7171
7272``` sh
7373# Checkout the current pure-docker release branch
74- git checkout 3.8-customer-replica
74+ git checkout 3.8-customer-replica
7575
7676# Create the new pure-docker release branch
77- git checkout -B 3.9-customer-replica
77+ git checkout -B 3.9-customer-replica
7878
7979# Merge the publish-3.9 branch, which will have been created by the release tool, into the pure-docker release branch.
8080git merge publish-3.9
@@ -98,9 +98,15 @@ At this point you should evaluate the `git status` output as well as all the cha
9898During this process you will run into two merge conflicts:
9999
100100- Do not commit: ` deploy-caddy.sh ` or changes related to it, as ` deploy-apache.sh ` is used here.
101- - Do not commit: changes to ` deploy-pgsql.sh ` , as Postgres 9.6 is used here.
101+ - The prettier ignore should look like this:
102102
103- 4 . Push the changes to github
103+ ```
104+ .github/
105+ *.md
106+ rootfs/etc/docker/daemon.json
107+ ```
108+
109+ 1 . Push the changes to github
104110``` shell
105111git push --set-upstream origin 3.9-customer-replica
106112```
You can’t perform that action at this time.
0 commit comments