Version Control Advanced: Git Workflows dan Best Practices

Git adalah distributed version control system yang essential untuk modern development. Beyond basics: Branching strategies: Git Flow (main, develop, feature, release, hotfix branches, formal process), GitHub Flow (lightweight: main dan feature branches, continuous deployment), Trunk-Based Development (short-lived branches, frequent integration, requires good CI/CD). Feature branches: branch per feature, regular commits, descriptive names (feature/user-authentication), delete after merge. Commit best practices: atomic commits (single logical change), descriptive messages (conventional commits: feat, fix, docs, style, refactor, test, chore), write in imperative mood, reference issue numbers. Advanced commands: git rebase (rewrite history, create linear history, interactive rebase untuk squash/reorder commits), git cherry-pick (apply specific commits), git bisect (binary search untuk find bug introduction), git stash (save work-in-progress), git reflog (recover lost commits), git submodules/subtrees (manage dependencies). Merge vs Rebase: merge preserves history (create merge commit), rebase creates linear history (cleaner but rewrites history, never rebase shared branches). Conflict resolution: understand conflict markers, use merge tools (VS Code, KDiff3), test after resolving. Collaboration workflows: Fork dan Pull Request (open source model), Shared Repository (team members push ke same repo), code reviews mandatory, automated testing via CI/CD. Branch protection rules: require PR reviews, status checks pass, no direct push ke main. Tags: mark releases (semantic versioning v1.2.3), lightweight vs annotated tags. Git hooks: client-side (pre-commit untuk linting, pre-push untuk tests), server-side (pre-receive, post-receive untuk CI triggers). Large files: Git LFS (Large File Storage) untuk binary files, avoid committing node_modules, build artifacts. Repository maintenance: git gc (garbage collection), keep history clean, use .gitignore properly. Monorepo vs multirepo: monorepo advantages (shared code, atomic changes), tools seperti Nx, Turborepo. Security: sign commits dengan GPG keys, credential management (SSH keys, personal access tokens), audit repository access. Tools: GitKraken, SourceTree untuk GUI, diff tools, GitHub/GitLab features (issues, projects, actions, packages). Troubleshooting: detached HEAD state, merge conflicts, corrupted repository. Migration strategies: migrate from SVN/Mercurial. Git philosophy: commit often, pull regularly, communicate dengan team. Mastering Git increases productivity dan enables effective collaboration dalam teams of any size.