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

Temporary Fix for the deadlink for user guide documentation of setting up jenkins on google cloud #7601

Closed

Conversation

yashpal2104
Copy link
Contributor

fixes #7589. Fixed the broken link for the tutorial to setup Jenkins on google cloud by inserting a video in place of the deadlink. It can be modified later if someone wants to take the next step of creating text that describes how to use Jenkins on Google Cloud.

yashpal2104 and others added 18 commits October 9, 2024 19:16
…into using-credentials

Updated UI screenshots for the user guide for the managing and configure
credentials for jenkins
…into using-credentials

Updated UI screenshots for the user guide for the managing and configure
credentials for jenkins
@yashpal2104 yashpal2104 requested a review from a team as a code owner October 12, 2024 10:30
@zbynek
Copy link
Contributor

zbynek commented Oct 12, 2024

Please make sure the PR contains only the relevant commit(s), in this case just 991929e

Maybe besides the video you could also add a link to https://cloud.google.com/blog/products/gcp/using-jenkins-on-google-compute-engine-for-distributed-builds which contains some text + images from the deleted tutorial.

@yashpal2104
Copy link
Contributor Author

yashpal2104 commented Oct 12, 2024

I don't know why but all the previous commits keep adding on my PR although I created a new branch. Same is happening here #7600 can you like tell me what am I doing wrong?

@krisstern
Copy link
Member

Hi @yashpal2104 I think you may have created a new branch based off of a feature branch and not the master branch. To correct this you will need to rebase against the master branch. Also, moving forward you should first switch to the most up-to-date master branch before you create a new feature branch off this.

@krisstern
Copy link
Member

If you need help with the steps do let us know.

@yashpal2104
Copy link
Contributor Author

Oh ok now I understand what my mistake was I will try it myself first if I need some help I will definitely reach out to you. Thank you again for your help

@yashpal2104
Copy link
Contributor Author

yashpal2104 commented Oct 12, 2024

Hey @krisstern can you help me understand the rebase thing you were talking about like what I understand was the commits I make are forwarded again when I do git rebase and after that all the commits are added on top of the other right? also how do I know which one is good 'rebase' or 'merge' -> 'fast forwarding' or 'no-ff'
How do I get my master branch clear of my commits in my local repo and up to date along with the original repo of jenkins' master branch clone

@krisstern
Copy link
Member

Duplicated in #7602

@krisstern krisstern closed this Oct 12, 2024
@krisstern
Copy link
Member

Hi @yashpal2104, by rebasing I meant something like the below steps (note there can be variations based on the setup):

git switch master
git pull origin master
git fetch origin
git switch feature-branch-name
git rebase origin/master

If you do this your feature branch would be rebased to the latest commit of the master branch.

@yashpal2104
Copy link
Contributor Author

And what if when I git pull origin master what if my origin is where I pushed the wrong changes which is my remote repo wouldn't it then change or say contaminate my master branch, does that happen?
And git fetch origin then fetches all the new updates from the remote repo origin which if it gets contaminated(I don't know if it gets contaminated )when I push from my local branch to my remote repo origin

@yashpal2104 yashpal2104 deleted the fix-deadlink-google-cloud branch October 22, 2024 13:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Broken link
3 participants