Skip to content

Commit 0e377bf

Browse files
committed
adjust CAKE_README.md on how to update the fork
1 parent e45dc9b commit 0e377bf

File tree

1 file changed

+20
-1
lines changed

1 file changed

+20
-1
lines changed

CAKE_README.md

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,23 @@ dokku storage:mount automation /var/lib/dokku/data/storage/automation:/home/node
8787

8888
With that, the community node is now persisted across rebuilds and restarts.
8989

90-
But I am not sure how to update community nodes yet...
90+
But I am not sure how to update community nodes yet...
91+
92+
93+
## Updating the fork
94+
95+
This repo is a fork of https://github.com/d1ceward-on-dokku/n8n_on_dokku
96+
97+
The base repo gets updated regularly to contain the latest n8n version and bug fixes.
98+
99+
We could just merge the updates from the fork, but this would create a lot of merge commits which gets messy over time.
100+
101+
Therefore, we just rebase the fork on top of the base repo and then push it to our fork.
102+
103+
```bash
104+
git remote add upstream [email protected]:d1ceward-on-dokku/n8n_on_dokku.git
105+
git fetch upstream
106+
git checkout master
107+
git rebase upstream/master
108+
git push -f origin master
109+
```

0 commit comments

Comments
 (0)