Skip to content

Conversation

@jmagak
Copy link
Member

@jmagak jmagak commented Nov 6, 2024

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

Version(s): 1.3, 1.4

Issue: RHIDP-4827

Link to docs preview:

Reviews:

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

Additional information:

@rhdh-bot
Copy link
Collaborator

rhdh-bot commented Nov 6, 2024

@jmagak jmagak changed the title RHIDP 3742 Discover Correct Book Title RHIDP 3742-Discover-Correct Book Title Nov 6, 2024
@themr0c
Copy link
Member

themr0c commented Nov 6, 2024

This PR has also content from https://github.com/redhat-developer/red-hat-developers-documentation-rhdh/pull/663/files, is it a mistake?

@jmagak jmagak force-pushed the RHIDP-3742-Discover-Correct-book-title branch from 968d778 to 661d8ce Compare November 6, 2024 14:51
@jmagak jmagak force-pushed the RHIDP-3742-Discover-Correct-book-title branch from 0436b8d to 4e266a6 Compare November 7, 2024 11:52
@Gerry-Forde Gerry-Forde merged commit 8386144 into redhat-developer:main Nov 7, 2024
3 checks passed
@Gerry-Forde
Copy link
Member

/cherrypick release-1.3

@openshift-cherrypick-robot
Copy link
Contributor

@Gerry-Forde: #676 failed to apply on top of branch "release-1.3":

Applying: Correct book title
.git/rebase-apply/patch:17: trailing whitespace.
:abstract: {product} is a developer platform designed to build developer portals. Use {product} to provide a streamlined development environment with a centralized software catalog to build high-quality software efficiently. 
.git/rebase-apply/patch:26: new blank line at EOF.
+
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in titles/discover/master.adoc
Auto-merging titles/discover/master.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 Correct book title

In response to this:

/cherrypick release-1.3

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.

jmagak added a commit to jmagak/red-hat-developers-documentation-rhdh that referenced this pull request Nov 8, 2024
* Correct book title

* Correct book title

* Correct book title

* Correct book title
Gerry-Forde pushed a commit that referenced this pull request Nov 8, 2024
* Correct book title

* Correct book title

* Correct book title

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants