(Don't Merge) Testing logs with latest on main #471
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
scme0
force-pushed
the
chore/merge-logs-and-gitops-operator-bump
branch
from
14dca29 to
61d4818
Compare
# Conflicts: # charts/gitops-runtime/README.md
scme0
force-pushed
the
chore/merge-logs-and-gitops-operator-bump
branch
from
61d4818 to
04f7690
Compare
scme0
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Branches
mainfeat/workflows-codefresh-saas-s3Note:
The only conflict during the merge was in the README.md which was fixed by doing a re-generate of the readme file after merging.