What is Git?
Git is a version control system that helps you keep track of the changes in your project over time. Think of it as a tool that takes "snapshots" of your work at different stages, allowing you to:
Save the history of your project.
Collaborate with others without losing any progress.
Undo mistakes by reverting to previous versions of your work.
What is GitHub?
GitHub is an online platform that hosts Git repositories. It allows developers to share their projects, collaborate with others, and work together seamlessly. While Git is the tool for version control, GitHub acts as a hub where you can:
Share your projects with the world.
Collaborate with contributors from anywhere.
Store your code securely online.
Basic Git Commands to Get Started
Here are some fundamental Git commands to help you begin:
1. git status
This command shows the current state of your project.
It helps track changes that haven’t been saved yet.
Untracked files are changes that Git hasn’t photographed yet.
2. git add
Use this command to move untracked files to the staging area.
The staging area is like preparing a file to be included in the next snapshot (commit).
# Example:
git add <file_name>
Modifying Files and Viewing Project History
1. Modifying Files
When you make changes to your files, Git tracks them, and you can save these changes by committing them.
2. Viewing Project History
Use the git log command to see all the previous commits in your project.
Example:
# Example:
git log
3. Removing Commits
To undo commits, use the git reset command.
# Example:
git reset --soft <commit_hash>
Using Git Stash
Sometimes, you might need to switch tasks but don’t want to commit your changes yet. Use:
1. git stash
- Saves your changes temporarily without committing them.
2. git stash pop
- Restores the saved changes.
Branching in Git
What is Branching?
Branching allows you to create a separate line of development to work on new features or bug fixes without affecting the main branch.
Why Use Branches?
Avoid errors in the main branch: It’s best not to commit directly to the main branch to prevent breaking it.
Isolate features or fixes: Each branch represents a specific feature or bug fix.
How to Create a Branch:
git branch <branch_name>
git checkout <branch_name>
Forking and Pull Requests
What is Forking?
Forking is creating a copy of someone else’s project in your own GitHub account. This allows you to:
Make changes to the project without affecting the original.
Experiment freely and propose changes later.
What is a Pull Request?
A pull request is how you ask the owner of the original project to review and merge your changes into their project.
Keeping Your Branch in Sync
When working on a forked or collaborative project, you need to keep your branch updated with the original project’s changes.
Steps to Sync Your Branch:
Fetch all changes:
git fetch --allReset your branch to the main branch of the upstream project:
git reset --hard upstream/main
Merging and Resolving Merge Conflicts
Merging Commits
To combine multiple commits into one, you can use the squash option.
Resolving Merge Conflicts
Merge conflicts occur when multiple contributors change the same part of a file. Git will ask for your input to resolve these conflicts. Follow these steps:
Open the conflicting file.
Review the changes marked by Git.
Decide which changes to keep and edit the file accordingly.
Add the resolved file back to the staging area:
git add <file_name>Commit the resolved changes:
git commit
Best Practices for Git and GitHub
Always create a new branch for new tasks:
git checkout -b <new_branch>Open separate pull requests for each task: This keeps discussions and code reviews organized.
Keep your main branch stable: Test your changes thoroughly before merging.
Collaborate effectively: Communicate with your team to avoid conflicts and overlapping changes.
Git and GitHub are powerful tools for developers, whether you’re working alone or with a team. Start small, experiment with the commands, and you’ll soon master version control! Happy coding! 🚀