```markdown ## Section 5: Implementation & Coding - 3: Version Control (Git) Version Control Systems (VCS) are fundamental tools for managing changes to source code over time. Git, a distributed VCS, is the industry standard, enabling developers to track history, collaborate efficiently, and revert to previous states. Its distributed nature means every developer has a complete copy of the repository history, enhancing speed and resilience. ### Core Concepts & Local Workflow * **Repository (Repo):** A database storing project files and their complete revision history. * **Working Directory:** Your local project files. * **Staging Area (Index):** A holding area where you prepare changes for the next commit. * **Commit:** A snapshot of changes in the staging area, permanently recorded in the repo history. Each commit has a unique SHA-1 hash identifier and a descriptive message. ### Essential Git Commands 1. **Initialize/Copy:** `git init` (create new repo) or `git clone ` (copy existing repo). 2. **Track Changes:** `git status` (view changed/untracked files), `git add ` or `git add .` (stage changes). 3. **Record Snapshot:** `git commit -m "Descriptive message"` (create a commit from staged changes). 4. **View History:** `git log` (show commit history). ### Branching & Merging Branches allow parallel development without affecting the main codebase (often `main` or `master`). * **Create & Switch:** `git branch ` (create), `git checkout ` or `git switch ` (switch). * **Merge:** Switch to the target branch (e.g., `main`) and run `git merge ` to integrate changes. Git automatically creates a "merge commit" if possible. ### Collaboration with Remotes Remote repositories (e.g., on GitHub, GitLab) act as central hubs for team collaboration. * **Connect Remote:** `git remote add origin ` (link local repo to remote). * **Upload Changes:** `git push -u origin ` (send commits to remote; `-u` sets upstream tracking). * **Download Changes:** `git pull origin ` (fetch changes from remote and merge into your current branch - equivalent to `git fetch` followed by `git merge`). ### Handling Conflicts Conflicts occur when Git cannot automatically merge changes (e.g., different edits to the same file line). Git marks conflict zones in the file. To resolve: 1. Edit the file manually to choose the desired changes or combine them. 2. Stage the resolved file (`git add `). 3. Complete the merge with `git commit`. Git provides a default commit message for merge resolutions. ### Best Practices * Commit frequently with clear, concise messages describing the *why*. * Use feature branches for new work. * Pull changes from the shared branch (`main`) regularly to minimize conflicts. * Review changes (`git diff`) before staging and committing. * Leverage `.gitignore` to exclude temporary files, binaries, or sensitive data. ```

Course Progress:

Section 1: Introduction

Section 2: SDLC Models

Section 3: Requirements Engineering

Section 4: Software Design

Section 5: Implementation & Coding

Section 6: Software Testing

Section 7: Quality Assurance

Section 8: Maintenance & Evolution

Section 9: Project Management

Section 10: Configuration Management

Section 11: Advanced Topics

Section 12: Tools & Environments