Skip to content
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

Changes in the docs not merged in master branch #3116

Closed
camilamacedo86 opened this issue Dec 6, 2022 · 5 comments
Closed

Changes in the docs not merged in master branch #3116

camilamacedo86 opened this issue Dec 6, 2022 · 5 comments
Assignees
Labels
good first issue Denotes an issue ready for a new contributor, according to the "help wanted" guidelines. help wanted Denotes an issue that needs help from a contributor. Must meet "help wanted" guidelines. kind/bug Categorizes issue or PR as related to a bug. kind/documentation Categorizes issue or PR as related to documentation.

Comments

@camilamacedo86
Copy link
Member

What broke? What's expected?

The changes addressed in the PR: https://github.com/kubernetes-sigs/kubebuilder/pull/2857/files are not in the master branch. We need to cherry-pick it to the master branch and ensure we have them there.

Reproducing this issue

Check master branch and book-v3

KubeBuilder (CLI) Version

master

PROJECT version

No response

Plugin versions

No response

Other versions

No response

Extra Labels

No response

@camilamacedo86 camilamacedo86 added kind/bug Categorizes issue or PR as related to a bug. help wanted Denotes an issue that needs help from a contributor. Must meet "help wanted" guidelines. good first issue Denotes an issue ready for a new contributor, according to the "help wanted" guidelines. kind/documentation Categorizes issue or PR as related to documentation. labels Dec 6, 2022
@ShivamTyagi12345
Copy link
Member

/assign

@ShivamTyagi12345
Copy link
Member

ShivamTyagi12345 commented Dec 11, 2022

Hey @camilamacedo86 I am a bit new to this so its taking a while, Apologies for in-activeness.
What I get is I have to understand cherry-picking in git and then use it for making the commits available in PR: https://github.com/kubernetes-sigs/kubebuilder/pull/2857/files , visible in the master branch

@camilamacedo86
Copy link
Member Author

It is all fine @ShivamTyagi12345,

Note that the goal is to ensure the same content on master branch.
You can do that by cherry-pick such as:

  • git checkout -b mybranch
  • git cherry-pick 33c275b

OR

Just create the branch and copy and paste the content .

@ShivamTyagi12345
Copy link
Member

ShivamTyagi12345 commented Dec 12, 2022

I had to do the latter . Hope the changes are right in my PR

@camilamacedo86
Copy link
Member Author

Closing this one as done. Thank you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
good first issue Denotes an issue ready for a new contributor, according to the "help wanted" guidelines. help wanted Denotes an issue that needs help from a contributor. Must meet "help wanted" guidelines. kind/bug Categorizes issue or PR as related to a bug. kind/documentation Categorizes issue or PR as related to documentation.
Projects
None yet
Development

No branches or pull requests

2 participants