Skip to content

Conversation

@clay53
Copy link
Contributor

@clay53 clay53 commented Jul 14, 2023

I just started using Godot again after a few years. First thing I tried to do was play video fullscreen without stretching. So, I feel like might be crazy, but it only worked when I enabled expand on the video, contrary to what the manual states.
image

@AThousandShips
Copy link
Member

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

@clay53 clay53 changed the base branch from 4.1 to master July 14, 2023 14:37
@clay53
Copy link
Contributor Author

clay53 commented Jul 14, 2023

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

Do I have to change my branch's base to master too? Looks like there are conflicts.

@AThousandShips
Copy link
Member

AThousandShips commented Jul 14, 2023

You have to rebase your branch with git rebase -i master and write drop instead of pick for all the commits except for your own

You will then have to push with git push -f

@clay53
Copy link
Contributor Author

clay53 commented Jul 14, 2023

You have to rebase your branch with git rebase -i master and write drop instead of pick for all the commits except for your own

You will then have to push with git push -f

Looks good now

@AThousandShips AThousandShips added area:manual Issues and PRs related to the Manual/Tutorials section of the documentation bug cherrypick:4.0 cherrypick:4.1 labels Jul 14, 2023
@mhilbrunner mhilbrunner merged commit b9983af into godotengine:master Jul 22, 2023
@mhilbrunner
Copy link
Member

Thanks and congrats on your first merged contribution to Godot's docs!

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

Labels

area:manual Issues and PRs related to the Manual/Tutorials section of the documentation bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants