Skip to content

Commit 59b6555

Browse files
committed
add upstream sync instructions
1 parent 30c6090 commit 59b6555

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

README.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,12 @@ Using addwiki:
55
https://github.com/addwiki/mediawiki-api
66

77
Copy public_html/config.json.template to config.json and modify for your needs
8+
9+
## Syncing this fork
10+
- Switch/Create a branch for the merge
11+
- Add local upstream remote: `git remote add upstream https://github.com/magnusmanske/quickstatements`
12+
- Fetch upstream: `git fetch upstream`
13+
- Merge master(!) branch: `git merge upstream/master`
14+
- Resolve conflicts (if any)
15+
- Update Changelog
16+

0 commit comments

Comments
 (0)