search

gfx-rs / metal-rs

Rust bindings for Metal
Apache License 2.0
567 stars 112 forks source link

Add `presented_time` to `MTLDrawable` #323

Closed grovesNL closed 3 months ago

grovesNL commented 3 months ago

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

MarijnS95 commented 3 months ago

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 https://github.com/gfx-rs/metal-rs/pull/300#event-12913158931, 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 commented 3 months ago

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.