From f8be60dbfcb59e0e095aec45e19a0bfca33d3022 Mon Sep 17 00:00:00 2001
From: Vihaan Kerekatte <vkerekatte@gmail.com>
Date: Thu, 28 May 2026 11:02:17 -0400
Subject: [PATCH 1/2] setup: add contribution guidelines

---
 CONTRIBUTING.md | 82 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..f6c652e
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,82 @@
+# Git Workflow
+
+## Branches
+
+Use `setup`, `feature`, or `fix` branches instead of committing directly to `main`.
+
+Examples:
+
+```txt
+setup/initial-page
+setup/folder-structure
+feature/sponsors-section
+feature/schedule-page
+fix/nav-alignment
+fix/mobile-layout
+```
+
+## Pull Requests
+
+After making changes to the files, do the following:
+
+1. Check what files were changed using `git status`. Ensure that only the files you've changed are listed there. Ensure that any keys and the following files aren't being committed:
+
+   ```txt
+   .env
+   .env.local
+   node_modules
+   ```
+
+2. Move the changes (files you want to commit) from your working directory to the staging area by running either `git add <filename>` to stage a specific file or `git add .` to stage all new and modified files.
+
+3. Permanently save those staged changes to your local database by running `git commit -m "your commit message here"`.
+
+4. Push your local commits to the GitHub repository by running `git push`.
+
+5. Go to the GitHub repository via https://github.com/HackNC/fall2026.
+
+6. Once you're on the GitHub repository, an orange banner will show up stating something along the lines of `<branchname> had recent pushes <time since you pushed> ago`. Click on `Compare & pull request` to create a pull request. Reference the relevant issue in the PR body (e.g. `Closes #17`) then click `Create pull request`.
+
+7. The leads will review the changes and merge them into `main`. _Keep working on other tasks while your pull request is being reviewed!_
+
+**Note:** Commit Early, Commit Often!
+
+## Commit Guidelines
+
+Prefix commit messages with the relevant label followed by a colon.
+
+Examples:
+
+```txt
+setup: initialize Next.js project
+setup: add folder structure
+feature: add sponsors section
+feature: create schedule page
+fix: correct nav alignment
+fix: resolve mobile layout issues
+```
+
+## Rules
+
+Do not commit:
+
+```txt
+.env
+.env.local
+node_modules
+```
+
+Keep pull requests focused and avoid mixing unrelated changes together.
+
+## Recommended Workflow
+
+1. Pull latest changes from `main`
+2. Create a new branch
+3. Make changes
+4. Test locally
+5. Commit changes
+6. Push branch
+7. Open pull request
+8. Request review from the leads
+
+The leads are responsible for reviewing and merging pull requests into `main`.

From 21ec2d5634a47ad63cd8973133cfea00b254f7c8 Mon Sep 17 00:00:00 2001
From: Vihaan Kerekatte <vkerekatte@gmail.com>
Date: Thu, 28 May 2026 11:03:23 -0400
Subject: [PATCH 2/2] setup: add contribution guidelines

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f6c652e..4d0acc9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -31,7 +31,7 @@ After making changes to the files, do the following:
 
 3. Permanently save those staged changes to your local database by running `git commit -m "your commit message here"`.
 
-4. Push your local commits to the GitHub repository by running `git push`.
+4. Push your local commits to the GitHub repository by running `git push -u origin <branchname>`.
 
 5. Go to the GitHub repository via https://github.com/HackNC/fall2026.