From 59b6555d1931f202f95127d541a6f6d0aa474973 Mon Sep 17 00:00:00 2001 From: dena Date: Fri, 6 Jun 2025 15:41:26 +0200 Subject: [PATCH] add upstream sync instructions --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 16db053..5ca8421 100644 --- a/README.md +++ b/README.md @@ -5,3 +5,12 @@ Using addwiki: https://github.com/addwiki/mediawiki-api Copy public_html/config.json.template to config.json and modify for your needs + +## Syncing this fork +- Switch/Create a branch for the merge +- Add local upstream remote: `git remote add upstream https://github.com/magnusmanske/quickstatements` +- Fetch upstream: `git fetch upstream` +- Merge master(!) branch: `git merge upstream/master` +- Resolve conflicts (if any) +- Update Changelog +