Release Workflow¶

git checkout develop
git pull origin develop

git checkout main
git merge develop

git push origin
git tag x.x.x
git push --tags

Also update original repository at https://github.com/craws/OpenAtlas-Discovery (or just tell Alex to do it)

Update instances¶

Checkout forked repositories:

git remote -v

Check if upstream remote is added. If not:

git remote add upstream https://github.com/acdh-oeaw/openatlas-discovery.git

Fetch upstream and origin changes

git fetch --all --tags

Checkout develop branch

git checkout develop

Rebase

git rebase upstream/develop

After all merge conflicts are resolved, test changes locally and take a look at the git history:

git log --oneline

Afterwards:

git push --force
git push --tags