Git & Version Control

Welcome to the Git documentation for the NetSuite development team. This section covers everything you need to know about using Git with VS Code for effective team collaboration.

What This Section Covers

Getting Started

• New Employee Onboarding - Complete setup guide for new team members
• Migration Guide - Moving from manual deployment to Git

Workflows & Practice

• Git Workflows - Branching strategies and team workflows
• SDF + Git Practice Guide - Hands-on practice with two developers
• Managing Merge Conflicts - Conflict resolution guide

Reference

• Git Commands Reference - Commands, shortcuts, and quick reference
• Git Troubleshooting - Common problems and solutions

---

Branch Strategy Overview

Our team uses the following branch structure:

main ─────●─────────────────────────●───────●─── (Production)
          │                         │       ↑
          │                    hotfix/fix   │
          │                         └───────┘
          │
          ↓
develop ──●────●────●────●────●────●────●─────── (Integration)
               │    ↑    │    ↑
               │    │    │    │
      feature/NS-123    bugfix/NS-456
               └────┘    └────┘

Branch Types

Branch	Purpose	Rule
main	Production code - what's live in NetSuite	NEVER push directly
develop	Integration testing - combines everyone's work	Merge via Pull Request only
feature/*	Your working branches for new features	Create from develop, merge back to develop
bugfix/*	Your working branches for bug fixes	Create from develop, merge back to develop
hotfix/*	Emergency production fixes	Create from main, merge to main AND develop

---

Quick Start

First Time Setup

1. Install Git - Download from git-scm.com
2. Configure your identity:

   git config --global user.name "Your Full Name"
   git config --global user.email "your.email@company.com"

3. Clone the repository - See Onboarding Guide for detailed steps

Daily Workflow

# Start of day - get latest code
git checkout develop
git pull origin develop

# Create your feature branch
git checkout -b feature/vendor-NS123-description

# Work, commit, push
git add .
git commit -m "[NS-123] Your change description"
git push -u origin feature/vendor-NS123-description

# Create Pull Request on GitHub

---

Golden Rules

1. NEVER push directly to main or develop
2. ALWAYS pull before starting new work
3. ALWAYS create a branch for your changes
4. Commit often with meaningful messages
5. Push your branch daily (backup!)
6. When in doubt, ASK before acting!

---

Need Help?

• Check the Git Troubleshooting section for common issues
• Review the Git Commands Reference for quick command lookup
• Contact IT Lead for repository access or complex issues