git clone https://github.com/jun229/nyu_buildathon.git
cd nyu_buildathon

cd frontend
npm install
cp .env.example .env.local
# Ask team lead for environment variables and add them to .env.local
npm run dev

cd backend
python -m venv venv
source venv/bin/activate  # Windows: venv\Scripts\activate
pip install -r requirements.txt
cp .env.example .env
# Ask team lead for environment variables and add them to .env
uvicorn app.main:app --reload

# 1. Get latest changes from main
git checkout main
git pull origin main

# 2. Create your feature branch
git checkout -b feature/your-feature-name

# Sync with main periodically (every 1-2 hours)
git checkout main
git pull origin main
git checkout feature/your-feature-name
git merge main

# Resolve any conflicts if they appear

# 1. Commit your changes
git add .
git commit -m "Brief description of what you built"

# 2. Final sync with main
git checkout main
git pull origin main
git checkout feature/your-feature-name
git merge main

# 3. Push your branch
git push origin feature/your-feature-name

# 4. Create a Pull Request on GitHub

# Everyone pulls the latest main
git checkout main
git pull origin main

# Delete your old feature branch
git branch -D feature/your-feature-name

# Git will show:
# CONFLICT (content): Merge conflict in filename.py

# 1. Open the conflicted file and look for:
<<<<<<< HEAD
your code here
=======
their code here
>>>>>>> main

# 2. Edit the file: keep what you need, remove the markers
# 3. Save the file, then:
git add .
git commit -m "Resolved merge conflicts"