Table of contentsIntroductionGit is a distributed version control system that helps you track changes in your code, collaborate with others, and maintain a history of your project. Git Bash is a terminal application for Windows that provides a Unix-like command-line experience for using Git.This guide will walk you through setting up Git, using Git Bash, and mastering essential Git commands for local development.InstallationWindowsDownload Git for Windows from git-scm.comRun the installer with default options (or customize as needed)Git Bash will be installed automatically as part of the packagemacOSInstall Git using Homebrew: brew install gitAlternatively, download from git-scm.comLinuxFor Debian/Ubuntu: sudo apt-get install gitFor Fedora: sudo dnf install gitFor other distributions, use the appropriate package managerVerifying InstallationOpen Git Bash (Windows) or Terminal (macOS/Linux) and type:This should display the installed Git version.Git Bash BasicsGit Bash provides a Unix-like shell experience on Windows. Here are some essential commands:Navigation Commandspwd Print working directoryls List files and directoriescd [directory] Change directorymkdir [directory] Create a new directoryrm [file] Remove a filerm -r [directory] Remove a directory and its contentsFile Operationstouch [filename] Create an empty filecat [filename] Display file contentsnano [filename] or vim [filename] Edit files in the terminalKeyboard ShortcutsCtrl + C Terminate the current commandCtrl + L Clear the screenTab Auto-complete commands or filenamesUp/Down arrows Navigate through command historyGit ConfigurationBefore using Git, configure your identity:Additional ConfigurationsSet your default editor:Enable colorful output:View all configurations:Basic Git WorkflowInitializing a RepositoryNavigate to your project folder and initialize a Git repository:Checking StatusSee which files are tracked, modified, or staged:Staging FilesAdd files to the staging area:Committing ChangesSave staged changes to the repository:Or open an editor to write a more detailed commit message:Viewing Commit HistoryBranching and MergingWorking with BranchesCreate a new branch:Switch to a branch:Create and switch to a new branch in one command:List all branches:Merging BranchesMerge changes from another branch into your current branch:Handling Merge ConflictsWhen Git cant automatically merge changes, youll need to resolve conflicts:Git will mark the conflicted filesOpen the files and look for conflict markers (<<<<<<<, =======, >>>>>>>)Edit the files to resolve conflictsAdd the resolved files: git add <filename>Complete the merge: git commitDeleting BranchesDelete a branch after merging:Remote RepositoriesAdding a Remote RepositoryViewing Remote RepositoriesPushing to a Remote RepositoryPulling from a Remote RepositoryCloning a RepositoryAdvanced Git CommandsStashing ChangesTemporarily store modified files to work on something else:Reverting ChangesUndo commits:Reset to a previous state (use with caution):Viewing and Comparing ChangesInteractive RebaseRewrite, squash, or reorder commits:TroubleshootingCommon Issues and SolutionsProblem: fatal: not a git repositorySolution: Make sure youre in the correct directory or initialize a repository with git initProblem: Unable to push to remote repositorySolution:Check if you have the correct permissionsPull latest changes first: git pull origin mainCheck if remote URL is correct: git remote -vProblem: Merge conflictsSolution: Resolve conflicts manually, then git add the resolved files and git commitProblem: Accidental commitSolution: Use git reset soft HEAD~1 to undo the last commit while keeping changesGit Best PracticesCommit frequently with clear, descriptive commit messagesCreate branches for new features or bug fixesPull before pushing to minimize conflictsWrite meaningful commit messages that explain why changes were madeUse .gitignore to exclude unnecessary files (build artifacts, dependencies, etc.)Review changes before committing with git diff and git statusKeep commits focused on a single logical changeUse tags for marking releases or important milestonesBack up your repositories regularlyDocument your Git workflow for team collaboration.gitignore ExampleCreate a .gitignore file in your repository root:Customize this file according to your projects specific needs.ConclusionGit and Git Bash provide powerful tools for version control and collaborative development. In this guide, we covered installation across platforms, essential Git Bash commands, repository initialization, the core add-commit workflow, branching strategies, remote repository management, and advanced operations like stashing and rebasing. We also addressed common troubleshooting scenarios and best practices to maintain a clean workflow. With these fundamentals, youre now equipped to track changes, collaborate effectively, and maintain a structured history of your projects. NikhilNikhil is an intern consultant at Marktechpost. He is pursuing an integrated dual degree in Materials at the Indian Institute of Technology, Kharagpur. Nikhil is an AI/ML enthusiast who is always researching applications in fields like biomaterials and biomedical science. With a strong background in Material Science, he is exploring new advancements and creating opportunities to contribute.Nikhilhttps://www.marktechpost.com/author/nikhil0980/This AI Paper Introduces Diversified DPO and ORPO: Post-Training Methods to Boost Output Diversity in Creative Writing with LLMsNikhilhttps://www.marktechpost.com/author/nikhil0980/A Beginners Guide to Using Visual Studio Code for PythonNikhilhttps://www.marktechpost.com/author/nikhil0980/Empowering Time Series AI: How Salesforce is Leveraging Synthetic Data to Enhance Foundation ModelsNikhilhttps://www.marktechpost.com/author/nikhil0980/Meta Reality Labs Research Introduces Sonata: Advancing Self-Supervised Representation Learning for 3D Point Clouds