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

fix: typos in documentation files #3947

Closed
wants to merge 6 commits into from

Conversation

leopardracer
Copy link
Contributor

This pull request contains changes to improve clarity, correctness and structure.

Description correction:
Corrected imlementations to implementations
Corrected includs to includes
Corrected trasnactions to transactions
Corrected accidently to accidentally
Corrected veiw to view
Corrected registerred to registered

Please review the changes and let me know if any additional changes are needed.

@leopardracer
Copy link
Contributor Author

@bfish713 Hi! I’ve just submitted a pull request. Could you please review it when you have a chance? I’d appreciate your feedback and any comments. Thank you!

@pls148 pls148 self-assigned this Dec 6, 2024
@pls148 pls148 self-requested a review December 6, 2024 18:07
Copy link
Contributor

@pls148 pls148 left a comment

Choose a reason for hiding this comment

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

Thanks for catching these! Branch just needs a rebase and I'll get it merged.

@leopardracer
Copy link
Contributor Author

@pls148 Ready.

@leopardracer
Copy link
Contributor Author

@pls148 check pls.

@pls148
Copy link
Contributor

pls148 commented Dec 7, 2024

Not sure if something just merged in but there's still a conflict with simple_vote.rs

@leopardracer
Copy link
Contributor Author

leopardracer commented Dec 7, 2024

Not sure if something just merged in but there's still a conflict with simple_vote.rs

How I can fix it? Maybe re-create a new PR in a base branch?

@pls148
Copy link
Contributor

pls148 commented Dec 7, 2024

Grab your branch, make sure your checkout is up to date and your upstream is set to origin/main (git branch --set-upstream-to=origin/main), then git rebase and look for the conflicts in crates/types/src/simple_vote.rs. fix the conflicts, then git add them, and do git rebase --continue

@leopardracer
Copy link
Contributor Author

leopardracer commented Dec 7, 2024

Grab your branch, make sure your checkout is up to date and your upstream is set to origin/main (git branch --set-upstream-to=origin/main), then git rebase and look for the conflicts in crates/types/src/simple_vote.rs. fix the conflicts, then git add them, and do git rebase --continue

@pls148 when running the git rebase command, there are no conflicts, everything is fine.

@leopardracer leopardracer closed this by deleting the head repository Dec 7, 2024
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