-
Notifications
You must be signed in to change notification settings - Fork 54
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
docs: Secure and monitor restructure #3280
base: main
Are you sure you want to change the base?
docs: Secure and monitor restructure #3280
Conversation
@sixhobbits please resolve conflicts. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks like you updated the redirects.json, which is good, but that will only point refs from the Before Time to the new pages, there will also need to be redirects for /secure-and-monitor to /monitor and such
# Conflicts: # astro/src/content/json/features.json
@synedra sorry for the delay - could you clarify what still needs to be done. We do have redirects set up from the secure-and-monitor URLs to the new structure in that same file: |
@mark-robustelli please see the above discussion and review. |
@synedra It looks to me like the redirects should work. Are we OK to approve this or am I missing something? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good now, ship it!
@sixhobbits Sending this back your way for a conflict resolution. |
# Conflicts: # astro/src/content/docs/operate/secure/token-storage.mdx
@bradmccarty - fixed |
@mooreds , it appears this has branch conflicts and I do not have the permissions to resolve. Do you? |
Whenever we have branch conflicts with Ritza PRs, there are two options:
|
# Conflicts: # astro/src/content/docs/get-started/run-in-the-cloud/cloud.mdx # src/redirects.json
@mark-robustelli the conflicts are fixed now |
@rideam I am still seeing. "This branch has conflicts that must be resolved." |
# Conflicts: # astro/src/content/docs/operate/monitor/prometheus.mdx
@mark-robustelli the merge that happened to main a few minutes ago for the Prometheus guide fab8bab is the one that created more conflicts after I had fixed the prior conflicts. I have fixed the conflicts again but further merges to main may cause more conflicts since this PR has many file changes. |
# Conflicts: # src/redirects.json
No description provided.