Welcome to your slightly less terrifying Git setup

If you are tired of typing git commands until your fingers fall off or begging teammates to push changes, this guide uses Sourcetree as a friendly git gui and Bitbucket as the remote host to make version control less painful. You will learn how to install and configure Git and Sourcetree, clone a repo, create feature branches, commit with meaning, push to Bitbucket, open pull requests, and survive merge conflicts.

Install and link Git and Sourcetree

First install Git on your machine and set your name and email. Then install Sourcetree and add your Bitbucket account in the settings so you are not typing passwords like it is 1999. If you prefer fewer login headaches create SSH keys and add them to Bitbucket. SSH keys save time and dignity when you push repeatedly.

Quick checklist

• Install Git and set git config user.name and user.email
• Install Sourcetree and add your Bitbucket account
• Create or add SSH keys to Bitbucket for painless pushing

Clone the repository and start branching

Use Sourcetree clone to pull the project locally. Choose HTTPS or SSH keys depending on your setup. Once cloned create a feature branch with a clear name. Short and descriptive branch names help your teammates avoid staring blankly at the commit log.

Make changes and commit like a human

Edit files in your preferred editor and then stage changes in Sourcetree. Commit with messages that explain why the change was made and not only what changed. Good commit messages are the little diaries future you will thank you for.

Push and open a pull request

Push your branch from Sourcetree to Bitbucket. From the Bitbucket web UI open a pull request to request review. A pull request is a polite way to ask for approval rather than hoping for a miracle. Add reviewers, a short description, and link any relevant issue numbers.

Resolve merge conflicts without panic

If conflicts appear use Sourcetree to inspect conflicting files or open your preferred merge tool. Test the merged branch locally before merging on Bitbucket to avoid surprise pipeline failures. Remember that small commits and small pull requests reduce conflict drama.

Best practices that do not suck

• Create a branch per feature or bug
• Keep commits small and focused
• Write clear commit messages and PR descriptions
• Use CI on Bitbucket to catch issues early
• Test locally before merging

Follow these steps and you will move from chaos to a predictable git workflow. Sourcetree gives you a visual grip on branching and bitbucket handles collaboration. Keep practicing and your commit history will stop being a crime scene.