Skip to content

Conversation

@Stevoisiak
Copy link
Contributor

Changes a hyperlink In the tutorial for Your First 2D game, Dodge the Creeps, to link directly to the Dodge the Creeps folder of the Godot demo projects page instead of the main repository page that contains multiple games.

@skyace65 skyace65 added enhancement area:getting started Issues and PRs related to the Getting Started section of the documentation cherrypick:4.1 cherrypick:4.2 labels Dec 2, 2023
@AThousandShips
Copy link
Member

You should target master not 4.2, changes can then be cherry picked, see here.

If you need more information about the update process please see: PR Workflow - Updating your branch. If wanted I can fix the branch for you.

@Piralein Piralein added the needs work Needs additional work by the original author, someone else or in another repo label Dec 2, 2023
@Stevoisiak
Copy link
Contributor Author

Stevoisiak commented Dec 3, 2023

You should target master not 4.2, changes can then be cherry picked, see here.

If you need more information about the update process please see: PR Workflow - Updating your branch. If wanted I can fix the branch for you.

Thanks, I would appreciate help fixing the branch. I'm running into a merge conflict when I try to rebase.

image

@AThousandShips
Copy link
Member

AThousandShips commented Dec 3, 2023

Try git rebase -i --onto master 4.2 (making a note to investigate adding a note to the tutorial, this splices the commits and skips certain unshared one), but I'll help today when I have time otherwise 🙂

Also you should use git rebase rather than git pull, my bad I linked the wrong header, should have been this

@AThousandShips AThousandShips changed the base branch from 4.2 to master December 3, 2023 10:37
Changes a hyperlink In the tutorial for Your First 2D game, Dodge the Creeps, to link directly to the Dodge the Creeps folder of the Godot demo projects page instead of the main repository page that contains multiple games.
@AThousandShips AThousandShips removed the needs work Needs additional work by the original author, someone else or in another repo label Dec 3, 2023
@AThousandShips
Copy link
Member

Done!

@skyace65 skyace65 merged commit c807cce into godotengine:master Dec 3, 2023
@skyace65
Copy link
Contributor

skyace65 commented Dec 3, 2023

Thanks!

@Stevoisiak Stevoisiak deleted the patch-1 branch December 8, 2023 18:08
@mhilbrunner
Copy link
Member

Cherry-picked to 4.2.

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

Labels

area:getting started Issues and PRs related to the Getting Started section of the documentation cherrypick:4.1 enhancement

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants