cloudserver
cloudserver copied to clipboard
Bump version to 8.6.9
Hello github-actions[bot],
My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.
Status report is not available.
The following options are set: bypass_author_approval, bypass_jira_check
Conflict
A conflict has been raised during the creation of
integration branch w/8.7/feature/bump-8.6.9 with contents from feature/bump-8.6.9
and development/8.7.
I have not created the integration branch.
Here are the steps to resolve this conflict:
$ git fetch
$ git checkout -B w/8.7/feature/bump-8.6.9 origin/development/8.7
$ git merge origin/feature/bump-8.6.9
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.7/feature/bump-8.6.9
The following options are set: bypass_author_approval, bypass_jira_check