Versions Compared

Old Version 33

changes.mady.by.user Tim Bossenmaier

Saved on

compared with

New Version 34

changes.mady.by.user Tim Bossenmaier

Saved on

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

...

Merge release into master

Merge the release branch tag into master.

Note

During the last release (0.67.0) there where some merge conflict when merging the new release tag into master.

The following link helped to resolve the problems: https://stackoverflow.com/questions/173919/is-there-a-theirs-version-of-git-merge-s-ours

...

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_committag (ID of merge commit)

Publish Docker images

...