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

Add presented_time to MTLDrawable #323

Merged
merged 1 commit into from
May 23, 2024

Conversation

grovesNL
Copy link
Collaborator

Rebased #300

GitHub closed the original PR automatically while I was rebasing the PR - probably because I was trying to push the new commit to the remote master and there's some kind of special handling for default branches

@grovesNL grovesNL merged commit 8e92adc into gfx-rs:master May 23, 2024
2 checks passed
@grovesNL grovesNL deleted the marcpabst-master-rebased branch May 23, 2024 17:41
@MarijnS95
Copy link
Contributor

MarijnS95 commented May 23, 2024

GitHub closed the original PR automatically while I was rebasing the PR - probably because I was trying to push the new commit to the remote master and there's some kind of special handling for default branches

In hopes of helping you understand what happened:

  1. Your force push at add presented_time to Drawable  #300 (comment), pushed the master of the fork, which the PR was created from, to be equal with the master of gfx-rs/metal-rs;
  2. GitHub detects that there is no difference between the source branch and the master branch;
  3. Hence assumes that everything was already merged into the target branch, and closes the PR.

You can sometimes recover from this by:

  1. Force-pushing the original commit (before the force-push) to the PR source branch (i.e. git push -f https://github.com/marcpabst/metal-rs 3be029b:master in this case);
  2. This makes GitHub show the "reopen pull request" button;
  3. Then you can finally force-push the rebase, this time not just the master branch of gfx-rs/metal-rs but with the rebased/cherry-picked PR commit on top.

Hope that helps!

@grovesNL
Copy link
Collaborator Author

Thanks! The strange thing is that I did attempt to force push a local branch that was already rebased with the new commit on top. Maybe I was on the wrong local branch by mistake but I don't think so.

The tip about reopening it is good - I'll try that next time. I wasn't sure if it would let me do that because the PR itself was giving me push access to that remote.

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.

2 participants