Project

General

Profile

Release Workflow

  • Move open tickets: Roadmap
  • Close Redmine Version and add a release date
  • Update main, push changes, tag
git checkout develop
git pull origin develop

git checkout main
git merge develop

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

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

Finishing

  • Update server list

Also available in: PDF HTML TXT