Skip to content

Conversation

@pabel-rh
Copy link
Member

@pabel-rh pabel-rh commented Nov 14, 2024

IMPORTANT: Do Not Merge - To be merged by Docs Team Only

Version(s): 1.4

Issue: RHIDP-4862

Link to docs preview:

Reviews:

  • SME: @ mention assignee
  • QE: @ mention assignee
  • Docs review: @ mention assignee
  • Additional review: @mention assignee (by writer)

Additional information:

@rhdh-bot
Copy link
Collaborator

rhdh-bot commented Nov 14, 2024

@04kash
Copy link
Member

04kash commented Nov 19, 2024

Can you change this line: https://github.com/redhat-developer/red-hat-developers-documentation-rhdh/pull/708/files#diff-04ff043450b84f23201d528293ad4455bd713bb6bedc0614b4788bc673628589R4 to

In {product}, the Tech Radar page is provided by the tech-radar and tech-radar-backend dynamic plugin, which is disabled by default. For information about enabling dynamic plugins in {product} see link:{LinkPluginsGuide}[Configuring plugins in {product}].

@04kash
Copy link
Member

04kash commented Nov 19, 2024

Copy link
Member

@04kash 04kash left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, left a few comments

@josephca josephca requested a review from gustavolira November 20, 2024 21:59
@josephca
Copy link
Member

@gustavolira can you provide a review? thanks!

@hmanwani-rh
Copy link
Member

@pabel-rh I’ve added a comment—could you please address it and rebase the branch? Once that’s done, we can move forward with merging this PR.

@hmanwani-rh hmanwani-rh merged commit 69d5ec8 into redhat-developer:main Nov 26, 2024
3 checks passed
gtrivedi88 pushed a commit to gtrivedi88/red-hat-developers-documentation-rhdh that referenced this pull request Nov 26, 2024
* Incorporated changes

* incorporated kashish's comment

* comments
gtrivedi88 pushed a commit to gtrivedi88/red-hat-developers-documentation-rhdh that referenced this pull request Nov 26, 2024
* Incorporated changes

* incorporated kashish's comment

* comments
@themr0c
Copy link
Member

themr0c commented Nov 28, 2024

/cherry-pick release-1.4

@openshift-cherrypick-robot
Copy link
Contributor

@themr0c: #708 failed to apply on top of branch "release-1.4":

Applying: Incorporated changes
.git/rebase-apply/patch:23: trailing whitespace.
In {product}, the Tech Radar page is provided by the `tech-radar` and `tech-radar-backend` dynamic plugins, which are disabled by default. 
.git/rebase-apply/patch:62: trailing whitespace.
techRadar:        
.git/rebase-apply/patch:86: trailing whitespace.
backend:    
.git/rebase-apply/patch:87: trailing whitespace.
   reading:    
.git/rebase-apply/patch:88: trailing whitespace.
        allow:     
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	modules/getting-started/proc-customize-rhdh-tech-radar-page.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/getting-started/proc-customize-rhdh-tech-radar-page.adoc
CONFLICT (content): Merge conflict in modules/getting-started/proc-customize-rhdh-tech-radar-page.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Incorporated changes

In response to this:

/cherry-pick release-1.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Ready to merge 💂 Technical review done ⛅ Any procedure has been succesfully tested

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants