Skip to content

VideoCutscene: Change the video type from var to final - #1052

Draft
MRK2009 wants to merge 2 commits into
CodenameCrew:internal-mergefrom
MRK2009:internal-merge
Draft

VideoCutscene: Change the video type from var to final#1052
MRK2009 wants to merge 2 commits into
CodenameCrew:internal-mergefrom
MRK2009:internal-merge

Conversation

@MRK2009

@MRK2009 MRK2009 commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

Redo of #1051 and #1049

Oh please no, don't waste my time for nothing without knowing how to fix my pr.
I'm begging you please.

@MRK2009
MRK2009 marked this pull request as draft August 6, 2026 16:34
@MRK2009
MRK2009 marked this pull request as ready for review August 6, 2026 16:38
@r6915ee

r6915ee commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

Looking at the commit history and the other pull requests, it's probably defaulting to internal-merge because the branch is based off of internal-merge. I'd recommend applying the commit's changes to a new branch based off of main, and then making a new pull request using that branch.

@Raltyro

Raltyro commented Aug 6, 2026

Copy link
Copy Markdown
Member

Where does it do this in hxvlc? i think i'm against this?

@Raltyro
Raltyro marked this pull request as draft August 6, 2026 22:24
@Raltyro

Raltyro commented Aug 6, 2026

Copy link
Copy Markdown
Member

Please don't redo the prs, i can rebase the prs myself

@Raltyro
Raltyro force-pushed the internal-merge branch 2 times, most recently from 114f958 to 2e4caef Compare August 7, 2026 04:23
@MRK2009
MRK2009 marked this pull request as ready for review August 7, 2026 09:38
@MRK2009
MRK2009 marked this pull request as draft August 7, 2026 09:38
@MRK2009

MRK2009 commented Aug 7, 2026

Copy link
Copy Markdown
Contributor Author

Okay I'll wait.

@MRK2009

MRK2009 commented Aug 7, 2026

Copy link
Copy Markdown
Contributor Author

Where does it do this in hxvlc? i think i'm against this?

Idk, I read the docs anyway, just for a little clean-up to be more safe.

@MRK2009

MRK2009 commented Aug 7, 2026

Copy link
Copy Markdown
Contributor Author

Also I didn't mean to press ready for review, I didn't realise ofc.

@MRK2009

MRK2009 commented Aug 7, 2026

Copy link
Copy Markdown
Contributor Author

Looking at the commit history and the other pull requests, it's probably defaulting to internal-merge because the branch is based off of internal-merge. I'd recommend applying the commit's changes to a new branch based off of main, and then making a new pull request using that branch.

I'm too lazy to make a branch, that's the problem.

@Raltyro

Raltyro commented Aug 7, 2026

Copy link
Copy Markdown
Member

You could just make the changes in main and then switch the pr base branch to internal-merge theorically if it doesn't have any conflicts

@MRK2009

MRK2009 commented Aug 7, 2026

Copy link
Copy Markdown
Contributor Author

You could just make the changes in main and then switch the pr base branch to internal-merge theorically if it doesn't have any conflicts

Maybe I'll do that I guess.

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.

3 participants