Git tutorial with Bitbucket and Sourcetree (Git & Dev Tools)

Why This Matters

Learning how to use Bitbucket and Sourcetree effectively is essential for any developer looking to streamline their workflow, collaborate with others, and stay organized in a Git-based development environment. Understanding these tools will help you:

1. Collaborate efficiently with other developers on the same project without overwriting each other's changes.
2. Keep track of changes and easily rollback to previous versions if needed.
3. Debug common issues that may arise during development.
4. Prepare for job interviews by demonstrating proficiency in essential developer tools.
5. Gain a better understanding of Git and its core concepts, making you more versatile as a developer.
6. Work seamlessly with cloud-based repositories, which are becoming increasingly popular in modern development workflows.
7. use additional features offered by Bitbucket, such as pipelines and Bitbucket Pipelines, to automate tasks like testing, linting, and deployment.

Prerequisites

To follow this tutorial, you should have a basic understanding of:

1. The concept of version control systems (VCS) and Git.
2. Basic command-line navigation (Windows, Linux, or macOS).
3. Familiarity with text editors like Visual Studio Code, Sublime Text, or Atom.
4. A working internet connection to access Bitbucket and Sourcetree.
5. Knowledge of a programming language such as C++, Python, JavaScript, or Ruby, which are commonly used for developing projects in Git repositories.
6. Familiarity with the file structure and build process of your chosen programming language.
7. Basic understanding of common development practices like writing tests, linting code, and deploying applications.

Core Concept

Setting up Bitbucket and Sourcetree

1. Sign up for a free Bitbucket account at bitbucket.org.
2. Download and install Sourcetree from sourcetreeapp.com.
3. Launch Sourcetree, click on "Account," then "Add Account" to connect your Bitbucket account.
4. In the repository browser, click on "Clone," enter the URL of a public or private Bitbucket repository, and choose a local directory to store the project files.
5. Click "Clone" to download the repository to your local machine.
6. If you want to create a new repository in Bitbucket:

a. Log into Bitbucket.

b. Click on "Create" in the top navigation bar, then select "Repository."

c. Choose the desired options (e.g., repository name, visibility, and initial files).

d. Click "Create Repository."

1. If you want to create a new project locally:

a. Create a new directory for the project on your local machine (e.g., my_project).

b. Initialize a Git repository inside the project directory by running git init in the terminal.

c. Add a file with some initial code or content.

d. Stage and commit the new file by running git add followed by git commit -m "Initial commit" in the terminal.

1. Push your local repository to Bitbucket:

a. In Sourcetree, select your newly created local repository.

b. Click on the "Push" button in the upper right corner.

c. Choose the remote Bitbucket repository you want to push to and click "OK."

d. If prompted, enter your Bitbucket username and password or use SSH keys if you have set them up.

Basic Git commands in Sourcetree

1. Commit: Create a new commit with changes by clicking on the "Commit" button in the lower left corner, writing a commit message, and selecting the files to be committed.
2. Push: Send your local commits to the remote Bitbucket repository by clicking on the "Push" button in the upper right corner.
3. Pull: Fetch and merge any changes from the remote Bitbucket repository into your local repository by clicking on the "Pull" button in the upper right corner.
4. Branching and Merging: Create a new branch, switch between branches, and merge branches using the respective buttons in the lower left corner.
5. Stashing: Temporarily save your changes to a stash if you need to switch to another branch or task without committing.
6. Rebasing: Interactively rebase your local commits onto another branch using the "Rebase" option in the context menu (right-click on a commit).
7. Merging: Merge branches by selecting the destination branch, clicking on the "Merge" button in the lower left corner, and choosing the source branch to merge from.
8. Cherry-picking: Cherry-pick individual commits from another branch using the "Cherry-pick" option in the context menu (right-click on a commit).
9. Tagging: Create tags to mark specific points in your repository's history by right-clicking on a commit and selecting "Create Tag."
10. Fetching: Update your local repository with any new commits, branches, or tags from the remote Bitbucket repository using the "Fetch" option in the context menu (right-click on the remote repository).

Common Mistakes

1. Forgetting to commit changes: Always remember to commit your changes before pushing them to the remote repository to avoid losing work due to unexpected issues or interruptions.
2. Ignoring merge conflicts: When merging branches, resolve any merge conflicts that may arise by manually editing the conflicting files and committing the resolved version.
3. Not using descriptive commit messages: Writing clear and concise commit messages helps other developers understand the purpose of each commit and makes it easier to track changes over time.
4. Misusing branches: Using too many small branches or merging branches prematurely can lead to confusion and make it difficult to manage the project effectively.
5. Not stashing changes before switching branches: If you switch branches without stashing your changes, you may accidentally lose work if the new branch has unrelated changes that conflict with yours.
6. Not pulling before merging: Always pull any changes from the remote repository before merging branches to ensure that you have the latest version of the code and avoid merge conflicts.
7. Merging without resolving conflicts: If a merge results in conflicts, resolve them manually by editing the conflicting files and committing the resolved version.
8. Not using descriptive branch names: Using clear and concise names that describe the purpose of the branch (e.g., feature/new_login_page, bugfix/login_error) helps other developers understand the purpose of each branch and makes it easier to manage the project effectively.
9. Merging master into feature branches: Instead, merge feature branches into master to keep the main line of development clean and up-to-date.
10. Not using feature branches for new features or bug fixes: Using separate feature branches allows you to isolate changes and test them independently before merging them into the mainline.

Worked Example

In this example, we will create a simple "Hello, World!" project using Bitbucket and Sourcetree:

1. Create a new directory for the project on your local machine (e.g., hello_world).
2. Initialize a Git repository inside the project directory by running git init in the terminal.
3. Add a file named main.cpp with the following content:

#include <iostream>
int main() {
std::cout << "Hello, World!" << std::endl;
return 0;
}

1. Stage and commit the new file by running git add main.cpp followed by git commit -m "Initial commit" in the terminal.
2. Create a new repository on Bitbucket with the same name as your local project directory (e.g., hello_world) and make it public or private depending on your needs.
3. In Sourcetree, click on "Clone," enter the URL of your newly created Bitbucket repository, and choose the local project directory as the target location.
4. Click "Clone" to download the repository to your local machine.
5. Switch to the master branch in Sourcetree and pull any changes from the remote repository by clicking on the "Pull" button in the upper right corner.
6. Make some changes to the main.cpp file (e.g., add a comment or change the message) and commit them using Sourcetree's commit interface.
7. Push your local commits to the remote Bitbucket repository by clicking on the "Push" button in the upper right corner.
8. Create a new branch named feature/greeting_change:

a. Right-click on the master branch and select "Create Branch."

b. Enter the name feature/greeting_change and click "OK."

1. Switch to the newly created branch by clicking on it in the repository browser.
2. Modify the main.cpp file again (e.g., change the message).
3. Commit and push the changes to the remote Bitbucket repository.
4. Merge the feature/greeting_change branch into the master branch:

a. Right-click on the feature/greeting_change branch and select "Merge."

b. Choose the destination branch (master) and click "OK."

1. Pull any changes from the remote repository to ensure that your local repository is up-to-date.

Common Mistakes

1. Not pulling before merging: Always pull any changes from the remote repository before merging branches to ensure that you have the latest version of the code and avoid merge conflicts.
2. Merging without resolving conflicts: If a merge results in conflicts, resolve them manually by editing the conflicting files and committing the resolved version.
3. Not using descriptive branch names: Using clear and concise names that describe the purpose of the branch (e.g., feature/new_login_page, bugfix/login_error) helps other developers understand the purpose of each branch and makes it easier to manage the project effectively.
4. Merging master into feature branches: Instead, merge feature branches into master to keep the main line of development clean and up-to-date.
5. Not using feature branches for new features or bug fixes: Using separate feature branches allows you to isolate changes and test them independently before merging them into the mainline.
6. Ignoring merge conflicts: When merging branches, resolve any merge conflicts that may arise by manually editing the conflicting files and committing the resolved version.
7. Not using descriptive commit messages: Writing clear and concise commit messages helps other developers understand the purpose of each commit and makes it easier to track changes over time.
8. Misusing branches: Using too many small branches or merging branches prematurely can lead to confusion and make it difficult to manage the project effectively.
9. Not stashing changes before switching branches: If you switch branches without stashing your changes, you may accidentally lose work if the new branch has unrelated changes that conflict with yours.

Practice Questions

1. How do you create a new branch in Sourcetree?
2. What is the purpose of stashing changes in Git?
3. How would you resolve merge conflicts in a file using Sourcetree?
4. What is the difference between git pull and git fetch?
5. How do you revert to a specific commit in your local repository using Sourcetree?
6. How can you view the history of commits in your local repository using Sourcetree?
7. What is the purpose of tags in Git, and how would you create one using Sourcetree?
8. How do you merge branches in Sourcetree, and what happens if there are merge conflicts?
9. How can you view the differences between files before committing them in Sourcetree?
10. What is rebasing in Git, and how would you perform a rebase using Sourcetree?

FAQ

1. Do I need to use Bitbucket for Git repositories if I already have a GitHub account?

While both services offer similar functionality, there are differences between them, such as pricing plans and additional features offered by Bitbucket (like pipelines and Bitbucket Pipelines). You can use either service depending on your needs.

1. Can I push changes to a private Bitbucket repository without using SSH keys?

Yes, you can use HTTPS instead of SSH for pushing changes to a private Bitbucket repository, but it is less secure and may require additional permissions from the repository owner.

1. What are some best practices for naming branches in Git?

Use clear and concise names that describe the purpose of the branch (e.g., feature/new_login_page, bugfix/login_error). Avoid using short or ambiguous names like fix1 or feat2.

1. How do I handle large files in Git repositories?

Large files can cause problems when working with Git, such as slow performance and increased storage requirements. To manage large files, consider splitting them into smaller pieces, compressing them using tools like Gzip, or storing them outside the repository and referencing them instead.

1. What is a Git hook