Page History

...

Note

I also had similar problems during the 0.68.0 release and did the following:

Pull master & release branch

git checkout release/0.68.0

git merge master -s ours

git checkout master
git merge release/0.68.0

Note

For release 0.69.0 I used the following commands:

git checkout release/0.69.0

git merge master -s ours

git checkout master
git merge #commit_ID_of_the_last_commit

Update website and docs

Clone the incubator-streampipes-website project and checkout the dev branch.

...