Skip to content

Conversation

@thatplguy
Copy link
Collaborator

Adds a style guide for CN style and naming conventions to distinguish between CN identifiers and C identifiers.

There will be changes to the style guide shortly. See comments in this PR for more details: #84

Context

This PR replaces #84 – it rebases against origin/main and squashes the history from #84 into a single commit. It also incorporates the latest changes to origin/main (@dc-mak's VIP work). Should be ready to merge.

To review the differences with naming-conventions-2, run

git pull
git diff naming-conventions-2 cns/naming-conventions-2

Here's what I did to create this branch:

// Create this branch from the latest naming-conventions-2
git checkout naming-conventions-2
git pull
git checkout -b cns/naming-conventions-2

// Squash all commits on this branch into one
git rebase -i 3453f6889c53af99f1bfad2f787d413907b8e483

// ... fix several merge conflicts ...

// Rebase on origin/main to pick up Dhruv's VIP changes
git pull --rebase origin main

// ... fix a few more conflicts ...

Adds a style guide for CN style and naming conventions to distinguish between
CN identifiers and C identifiers.

There will be changes to the style guide shortly.  See the PR for more details:
#84
@thatplguy thatplguy requested a review from bcpierce00 October 9, 2024 04:43
@bcpierce00 bcpierce00 merged commit 6f42d52 into main Oct 9, 2024
1 check passed
@bcpierce00 bcpierce00 deleted the cns/naming-conventions-2 branch October 9, 2024 17:29
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.

4 participants