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.

Sign up for GitHub

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

Jump to bottom

Added some styles #1280

Merged
merged 7 commits into from
Jan 21, 2025
Merged

Added some styles #1280

merged 7 commits into from
Jan 21, 2025

Conversation

shargon
Copy link
Member

@shargon shargon commented Jan 16, 2025

Added some style rules, not included into .editorconfig in this pr because I need to deal with testing artifacts, this can be done in a different PR

shargon and others added 6 commits January 16, 2025 15:53
@shargon
Added some styles
011dda1
@shargon
Fix ut
d6d28de
@shargon
Fix dbg info
b829cc8
@shargon
update to 2025
294e40e
@Hecate2
Merge branch 'some-style' of github.com:neo-project/neo-devpack-dotne…
68511c2 
…t into some-style

# Conflicts:
#	src/Neo.Compiler.CSharp/Optimizer/Analysers/InstructionCoverage.cs
#	tests/Neo.Compiler.CSharp.TestContracts/Contract_GoTo.cs
@Hecate2
add copyright comments for new files
487f44c
Hecate2
Hecate2 previously approved these changes Jan 21, 2025
View reviewed changes
Copy link
Contributor

@Hecate2 Hecate2 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

I merged master into this branch, manually adding copyright comments in recent new files (Break and Continue contracts and unit tests). If not desired, please just git push --force origin some-style:some-style to drop my new commits.

@shargon shargon dismissed Hecate2’s stale review January 21, 2025 02:36

The merge-base changed after approval.

Hecate2
Hecate2 previously approved these changes Jan 21, 2025
View reviewed changes
Copy link
Contributor

@Hecate2 Hecate2 left a comment

Choose a reason for hiding this comment

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

I merged master into this branch, manually adding copyright comments in recent new files (Break and Continue contracts and unit tests). If not desired, please just git push --force origin some-style:some-style to drop my new commits.

@shargon shargon dismissed Hecate2’s stale review January 21, 2025 02:42

The merge-base changed after approval.

@Hecate2
Copy link
Contributor

Hecate2 commented Jan 21, 2025

Seems to be github automatically dismissing approvals. https://github.com/orgs/community/discussions/58535 says that, closing and re-opening the PR solves the problem.

Jim8y
Jim8y previously approved these changes Jan 21, 2025
View reviewed changes
@shargon shargon dismissed Jim8y’s stale review January 21, 2025 06:50

The merge-base changed after approval.

@Jim8y Jim8y closed this Jan 21, 2025
@Jim8y Jim8y reopened this Jan 21, 2025
@Jim8y
Copy link
Contributor

Jim8y commented Jan 21, 2025

Seems to be github automatically dismissing approvals. https://github.com/orgs/community/discussions/58535 says that, closing and re-opening the PR solves the problem.

it works~~~

@Jim8y Jim8y merged commit 110837e into master Jan 21, 2025
3 of 6 checks passed
@Jim8y Jim8y deleted the some-style branch January 21, 2025 06:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Jim8y Jim8y Jim8y approved these changes

@Hecate2 Hecate2 Hecate2 left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@shargon @Hecate2 @Jim8y