Skip to content

Conversation

@kaixiong
Copy link
Member

No description provided.

@kaixiong kaixiong added this to the 0.5.0_alpha1 milestone Jan 23, 2023
@kaixiong kaixiong self-assigned this Jan 23, 2023
@kaixiong kaixiong marked this pull request as draft January 27, 2023 20:04
@kaixiong
Copy link
Member Author

kaixiong commented Feb 5, 2023

@hartwork Looks like I somehow confused the branches, lost the changes locally, then lost it from GitHub via a forced push. Is it still possible to recover it from GitHub?

@hartwork
Copy link
Member

hartwork commented Feb 5, 2023

@kaixiong I'm optimistic that that can be fixed. A bit further up GitHub shows this:

Screenshot_20230205_180543_git_compare

Following the link behind that compare button shows that the old commit still had PNG saving code in it. I think what you'll need for a fix is something like this:

git checkout png-saves
git reset --hard c2b91ebffece693826fb3868ba1834a892285e6f
git push origin png-saves --force-with-lease

If we did not have that help from GitHub, I'd try something like git reflog --all | grep 'saving to PNG' locally. It doesn't show output here, but since you have more local history on that branch than me, maybe it shows things for you?

What do you think?

@kaixiong kaixiong force-pushed the png-saves branch 2 times, most recently from c2b91eb to 72a6982 Compare February 5, 2023 21:15
@kaixiong
Copy link
Member Author

kaixiong commented Feb 5, 2023

@hartwork Thanks, that seems to have worked. I hadn't realised there was a compare button in the GitHub timeline. Wonder what actually went down.

@hartwork
Copy link
Member

hartwork commented Feb 5, 2023

@kaixiong good to see PNG saving back! 👍

@kaixiong kaixiong force-pushed the png-saves branch 3 times, most recently from ee46da1 to ee33f7b Compare January 24, 2025 13:07
@kaixiong kaixiong marked this pull request as ready for review January 24, 2025 13:21
@kaixiong kaixiong requested a review from hartwork January 24, 2025 13:45
Copy link
Member

@hartwork hartwork left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kaixiong found some time now, here's some minor things I found:

Copy link
Member

@hartwork hartwork left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kaixiong thanks for the adjustments! 👍

@kaixiong kaixiong merged commit 53b86b6 into master Jan 29, 2025
6 checks passed
@kaixiong kaixiong deleted the png-saves branch January 29, 2025 17:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants