From 5b8f547083fa3839ec4ff47f0377964601d1c7c8 Mon Sep 17 00:00:00 2001 From: dena Date: Fri, 6 Jun 2025 15:44:27 +0200 Subject: [PATCH] add upstream sync instructions --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index fd05fa7..01a9c1d 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,12 @@ )) This is the OAuth interface for many of my Wikidata tools. It relies heavily on [this OAuth code](https://bitbucket.org/magnusmanske/magnustools/src/2f3811e80d0b215f9b45fb9b6da2d57536c56077/public_html/php/oauth.php?at=master&fileviewer=file-view-default). + +## Syncing this fork +- Switch/Create a branch for the merge +- Add local upstream remote: `git remote add upstream https://bitbucket.org/magnusmanske/widar/src/master/` +- Fetch upstream: `git fetch upstream` +- Merge master(!) branch: `git merge upstream/master` +- Resolve conflicts (if any) +- Update Changelog +