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.

Sign up for GitHub

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

Jump to bottom

improved HTML rendering #305

Merged
merged 1 commit into from
Jan 22, 2025
Merged

improved HTML rendering #305

merged 1 commit into from
Jan 22, 2025

Conversation

Peter230655
Copy link
Contributor

Made the HTML rendering a bit better

@Peter230655
Copy link
Contributor Author

I am unsure where to ask the question:
My local master is up-to-date
I branch off master to some branch, say, test to make a PR
While I work on the PR some other PRs get merged, so my local branch is no longer up-to-date.
Can I still make my PR from my out-of-date test branch?
Thanks!

@moorepants
Copy link
Member

Can I still make my PR from my out-of-date test branch?

Usually that is fine, but it could be that there is a conflict because the same file and lines were edited.

@moorepants moorepants merged commit cec2b1d into csu-hmc:master Jan 22, 2025
21 checks passed
@Peter230655
Copy link
Contributor Author

Can I still make my PR from my out-of-date test branch?

Usually that is fine, but it could be that there is a conflict because the same file and lines were edited.

Thanks! So I was right, that I closed my PR and started a new on, I guess.

@Peter230655 Peter230655 deleted the prob-parse-free-1 branch January 22, 2025 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Peter230655 @moorepants