docs: Secure and monitor restructure
@sixhobbits please resolve conflicts.
@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?
@sixhobbits Sending this back your way for a conflict resolution.
@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:
- ask Ritza to resolve them, since they control the fork
- add the ritza fork as an origin, pull down the branch, push it up as a branch in the fusionauth fusionauth-site repo, then resolve the conflicts from there (not as hard as it sounds). This choice means you end up creating another PR and closing out this one.
@mark-robustelli the conflicts are fixed now
@rideam I am still seeing. "This branch has conflicts that must be resolved."
@mark-robustelli the merge that happened to main a few minutes ago for the Prometheus guide https://github.com/FusionAuth/fusionauth-site/commit/fab8bab7bfe4583006f1328f6e9fb6c4ba6ef312 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.