improvement: S3C-3776 Dockerfile for kubernetes deployment#1448
improvement: S3C-3776 Dockerfile for kubernetes deployment#1448jonathan-gramain wants to merge 1 commit intodevelopment/7.4from
Conversation
Hello jonathan-gramain,My role is to assist you with the merge of this Status report is not available. |
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: $ git fetch
$ git checkout -B w/8.1/improvement/S3C-3776-dockerfileForKubeDeployment origin/development/8.1
$ git merge origin/w/7.10/improvement/S3C-3776-dockerfileForKubeDeployment
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.1/improvement/S3C-3776-dockerfileForKubeDeployment |
Add a Dockerfile that will be used by eve to build images suitable for a dev kubernetes deployment
f6b1730 to
915caf1
Compare
History mismatchMerge commit #f6b1730421019c3a79e3d3f87b047ffdb5f0393e on the integration branch It is likely due to a rebase of the branch Please use the |
|
/reset |
Reset completeI have successfully deleted this pull request's integration branches. |
ConflictA conflict has been raised during the creation of I have not created the integration branch. Here are the steps to resolve this conflict: $ git fetch
$ git checkout -B w/8.1/improvement/S3C-3776-dockerfileForKubeDeployment origin/development/8.1
$ git merge origin/w/7.10/improvement/S3C-3776-dockerfileForKubeDeployment
$ # <intense conflict resolution>
$ git commit
$ git push -u origin w/8.1/improvement/S3C-3776-dockerfileForKubeDeployment |
Waiting for approvalThe following approvals are needed before I can proceed with the merge:
|
Add a Dockerfile that will be used by eve to build images suitable for
a dev kubernetes deployment
Note: no impact on branches 8.x