From a10adf2026b95c442b494d87461a19bb81912396 Mon Sep 17 00:00:00 2001 From: dena Date: Fri, 6 Jun 2025 15:38:34 +0200 Subject: [PATCH] add upstream sync instructions --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index cc6303e..909907f 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,14 @@ It gets used by: - [wbstack/quickstatements](https://github.com/wbstack/quickstatements/blob/main/composer.json) - [wbstack/cradle](https://github.com/wbstack/cradle/blob/main/composer.json) +## Syncing this fork +- Switch/Create a branch for the merge +- Add local upstream remote: `git remote add upstream https://bitbucket.org/magnusmanske/magnustools/src/master/` +- Fetch upstream: `git fetch upstream` +- Merge master(!) branch: `git merge upstream/master` +- Resolve conflicts (if any) +- Update Changelog + ## Development in wbstack In order to test pending changes from this repository with a specific tool, you can target a specific branch from this repository.