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

Revert "refactor: Formatting and syntax fixes" #150

Merged
merged 1 commit into from
Feb 8, 2024

Conversation

ShinyMiraidon
Copy link
Collaborator

Reverts #147

@ShinyMiraidon ShinyMiraidon merged commit bbc34f2 into main Feb 8, 2024
2 checks passed
@ShinyMiraidon ShinyMiraidon deleted the revert-147-refactor branch February 8, 2024 15:44
@nickelpro
Copy link
Member

In the future, if something goes screwy with a fast-forward or other merge and you notice immediately, don't do a revert commit. It just further pollutes the history.

The "correct" thing to do (keeping in mind that git practices are very, very subjective) is to git reset to the earlier commit and then force upstream back to that commit.

If the commit is weeks old, or other commits are on top of it already, a revert might be appropriate.

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