Working with Branches¶

This section provides a beginner-friendly overview of working with branches in Git, covering key concepts and commands to help you manage your codebase effectively.

Branches¶

Branches in Git allow you to work on different versions of your project simultaneously. Think of a branch as a separate workspace where you can make changes without affecting the main codebase (often called the main or master branch). This is useful for:

Developing new features
Fixing bugs
Experimenting without risking the main project

Each branch is independent, so you can switch between them to work on different tasks. For example, you might have a feature-login branch for adding a login system and a bugfix-header branch for fixing a header issue.

Branches

Commands¶

Here are the essential Git commands for working with branches. These commands are run in your terminal or command prompt within your project directory.

Create a new branch:

git branch branch-name

Creates a new branch called branch-name but doesn’t switch to it.

Switch to a branch:

git checkout branch-name

Switches your working directory to the specified branch.

Create and switch to a new branch in one command:

git checkout -b branch-name

Combines creating and switching to a new branch.

List all branches:

git branch

Shows all branches in your repository. The current branch is marked with an asterisk (*).

Delete a branch (only after it’s merged or no longer needed):

git branch -d branch-name

Deletes the specified branch. Use -D instead of -d to force delete an unmerged branch (use with caution).

View remote branches:

git branch -r

Lists branches on the remote repository.

Merging Changes¶

Merging combines changes from one branch into another. There are two common ways to merge: locally or through a pull request (PR).

Local Merging¶

To merge changes from one branch into another (e.g., merging a feature branch into main):

Switch to the target branch (e.g., main):
```
git checkout main
```
Merge the feature branch into main:
```
git merge feature-branch
```
If there are no conflicts, Git will combine the changes. You can then push the updated main branch to the remote repository:
```
git push origin main
```

Merging Through a Pull Request (PR)¶

In team projects, pull requests are used to review and merge changes on platforms like GitHub, GitLab, or Bitbucket. Here’s how it works:

Push your branch to the remote repository:
```
git push origin feature-branch
```
On the platform (e.g., GitHub), create a pull request from feature-branch to main.
Team members review the PR, suggest changes, or approve it.
Once approved, merge the PR through the platform’s interface (often with options like "Merge," "Squash and merge," or "Rebase and merge").
After merging, delete the branch on the remote repository (optional but keeps things clean):
```
git push origin --delete feature-branch
```

Pulling Updates¶

To keep your local branches up-to-date with the remote repository, you need to pull changes. This is especially important before starting new work or merging.

Pull updates for the current branch:

git pull origin branch-name

Fetches and merges changes from the remote branch into your local branch.

Note: pull = fetch + merge (If the pull doesn't work, use fetch and merge, also useful for checking differences before merging)

Fetch updates without merging:

git fetch origin

Downloads changes from the remote repository but doesn’t merge them. Useful to check what’s new before merging.

Merge updates without merging:

git merge origin/branch-name

Merge changes from the remote repository.

For example, before working on main, run:

git checkout main
git pull origin main

This ensures your local main branch has the latest changes from the remote repository.

Handling Merge Conflicts¶

Merge conflicts occur when Git can’t automatically combine changes from two branches (e.g., if the same line in a file was edited differently in both branches). Here’s how to resolve them:

Identify the conflict: When you run git merge or git pull and a conflict occurs, Git pauses and shows a message like:
```
 CONFLICT (content): Merge conflict in file.txt
```
Open the conflicting files: Git marks conflicts in the affected files with conflict markers:
```
 <<<<<<< HEAD
 Your changes
 =======
 Changes from the other branch
 >>>>>>> branch-name
```
Resolve the conflict:
- Edit the file to keep the desired changes (or combine both).
- Remove the conflict markers (<<<<<<<, =======, >>>>>>>).
- Save the file.
Mark the conflict as resolved:
```
git add file.txt
```
Complete the merge:
```
git commit
```
Git will use a default commit message for the merge, or you can edit it.
Push the changes (if merging into a remote branch):
```
git push origin branch-name
```

Tips for avoiding conflicts:

Pull updates frequently to stay in sync with the remote branch.
Communicate with your team to avoid editing the same files simultaneously.
Use smaller, focused branches to reduce the chance of conflicts.