DEV Community

Cover image for Leveling Up in Git and GitHub: A Guide to Remotes, Pull Requests, and Beyond
Aayush Singh
Aayush Singh

Posted on

Leveling Up in Git and GitHub: A Guide to Remotes, Pull Requests, and Beyond

#git #github #beginners #opensource

This blog continues from my previous one. It is helpful to have a basic understanding of Git before proceeding.

Working with Remote Repositories(GITHUB)

Remote repositories are hosted versions of your local Git repository that allow multiple developers to collaborate on a project. GitHub is a popular platform for hosting such repositories. Let’s break down this topic with detailed explanations and examples.

Setting Up a Remote Repository

1.Create a Repository on GitHub

  • Log in to GitHub and click the "+" button in the top-right corner.

git hub new repo

  • Select "New Repository."
  • Name your repository (e.g., my-project) and choose whether it’s public or private.
  • Click Create Repository.

create repo

2.Link Your Local Repository to the Remote Repository
Command:

git remote add origin <repository-URL>
Enter fullscreen mode Exit fullscreen mode

Replace <repository-URL> with the HTTPS or SSH link from GitHub.

3.Verify the Remote Link
Command:

git remote -v
Enter fullscreen mode Exit fullscreen mode

output:

origin  https://github.com/username/my-project.git (fetch)
origin  https://github.com/username/my-project.git (push)
Enter fullscreen mode Exit fullscreen mode

Pushing Changes to the Remote Repository

Pushing uploads your local commits to the remote repository.
Command:

git push origin <branch-name>
Enter fullscreen mode Exit fullscreen mode

If it’s your first time pushing:

git push -u origin <branch-name>
Enter fullscreen mode Exit fullscreen mode

This command sets the default remote branch for future pushes. By including this, the specified branch becomes the default, allowing you to push and pull from your remote repository simply using git push and git pull. Without this setting, you would need to specify the branch name every time you push or pull.

Cloning a Remote Repository

Cloning creates a copy of an existing repository on your local machine.
Command:

git clone <repository-URL>
Enter fullscreen mode Exit fullscreen mode

you can get <repository-URL> by going on your repo and clicking Code button.
repository-URL

Pulling Changes from the Remote Repository

Pulling fetches and integrates changes from the remote repository into your local branch.
command:

git pull origin <branch-name>
Enter fullscreen mode Exit fullscreen mode

This ensures your local branch is up-to-date with the remote branch.

Resolving Merge Conflicts

A merge conflict occurs when two branches (or local and remote repositories) modify the same part of a file.

Steps to Resolve:

  1. Git identifies the conflicting file(s).

  2. Open the file(s) and look for conflict markers like:

    <<<<<<< HEAD
Your changes here
=======
Changes from the remote branch
>>>>>>> branch-name

  3. Edit the file to keep the desired changes.

  4. Stage the resolved file: git add <file>

  5. Commit the changes: git commit

Collaboration in GitHub

GitHub is a powerful platform for team collaboration. Here's how it helps developers work together effectively:

1 Forking a Repository

Forking creates a personal copy of someone else's repository on your GitHub account.Allows you to freely experiment with changes without affecting the original project.Imagine borrowing a book from a library, but you can mark it up and make notes in your copy without affecting the library's original book.

STEPS:

  1. Click the Fork button on the repository's GitHub page.
  2. Your forked copy will appear in your GitHub account.

2 Pull Requests

A pull request (PR) is a request to merge your changes (usually in a feature branch of your forked repository) into the original repository.Lets others review, discuss, and merge your changes into the main project.

STEPS:

  1. Push your changes to your forked repository.
  2. Click New Pull Request on the original repository's page.
  3. Compare your changes and describe them before submitting.

3 Reviewing Code

Reviewing code involves examining PRs for correctness, style, and quality before merging.Ensures that the codebase remains high quality and free of errors.
Key Actions:

  • Add comments.
  • Approve the PR.
  • Request changes if needed.

Step-by-Step Workflow to contribute to an original project

1 Fork the Original Repository
2 Clone Your Forked Repository
Clone your fork to your local machine:

git clone https://github.com/your-username/forked-repo.git
Enter fullscreen mode Exit fullscreen mode

Navigate into the project directory:

cd forked-repo
Enter fullscreen mode Exit fullscreen mode

3 Set the Original Repository as an Upstream
This ensures you can sync your fork with the original repository.
Add the original repository as an upstream remote:

git remote add upstream https://github.com/original-owner/original-repo.git
Enter fullscreen mode Exit fullscreen mode

Check the remotes:

git remote -v
Enter fullscreen mode Exit fullscreen mode

Output:

origin   https://github.com/your-username/forked-repo.git (fetch)
upstream https://github.com/original-owner/original-repo.git (fetch)
Enter fullscreen mode Exit fullscreen mode

4 Create a Feature Branch
Before making changes, create a new branch for your feature or bug fix:

git checkout -b feature-branch
Enter fullscreen mode Exit fullscreen mode

Make your changes, test them, and commit them:

git add .
git commit -m "Add feature X"
Enter fullscreen mode Exit fullscreen mode

5 Push Changes to Your Forked Repository
Push the feature branch to your forked repository:

git push origin feature-branch
Enter fullscreen mode Exit fullscreen mode

6 Sync with the Original Repository (if needed)
Before creating a pull request (PR), ensure your fork is up-to-date with the original repository.

Fetch changes from the original repository:

git fetch upstream
Enter fullscreen mode Exit fullscreen mode

Merge those changes into your local main branch:

git checkout main
git merge upstream/main
Enter fullscreen mode Exit fullscreen mode

7 Create a Pull Request (PR)
On GitHub:

  • Go to your forked repository.
  • Switch to the feature-branch.
  • Click Compare & pull request.
  • Write a descriptive title and summary for your changes.
  • Submit the PR to the original repository's main branch.

Managing Issues and Projects

GitHub provides tools for tracking bugs, features, and tasks.
1 Issues
Issues are GitHub’s way of tracking bugs, feature requests, or tasks.Centralized discussion for solving problems.Think of issues as sticky notes on a whiteboard, each representing something that needs attention.
Steps to Create an Issue:

  • Go to the Issues tab in the repository.
  • Click New Issue.
  • Describe the problem or request.

2 Labels
Labels categorize issues (e.g., "bug," "enhancement").Labels are like tags you put on your sticky notes to organize them.

3 Milestones
Milestones group related issues to track progress toward a specific goal.Like grouping sticky notes for a project deadline.

4 GitHub Projects
A project board organizes issues and pull requests into a visual workflow.Like a Kanban board with columns for "To Do," "In Progress," and "Done."

Doing this much is enough for beginner for now to get started. now I will discuss about some advance concept if you came till here, I will encourage you to read and try to understand basics of this advance concept

Advanced Git Concepts

1 Rebasing
Rebasing rewrites commit history to create a linear sequence of commits.Imagine organizing your shuffled photo album into chronological order.
command:

git rebase <branch-name>
Enter fullscreen mode Exit fullscreen mode

2 Cherry-Picking
Apply a specific commit from one branch to another.Like copying a single page from one book into another.
command:

git cherry-pick <commit-hash>
Enter fullscreen mode Exit fullscreen mode

3 Stashing
Temporarily saves uncommitted changes to a stack.Like putting your work on hold and tucking it into a drawer.git stash is like moving changes to backstage and calling it to the untracked area with git stash pop or deleting backstage data with git stash clear.

git stash
git stash apply
Enter fullscreen mode Exit fullscreen mode

Working with CI/CD Pipelines

What is CI/CD?
Continuous Integration (CI) ensures code changes are tested automatically, and Continuous Deployment (CD) automates code deployment. Like a factory assembly line that builds, tests, and ships products automatically.

GitHub Actions
GitHub’s built-in CI/CD tool for automating workflows.Like a robot that handles repetitive tasks for you.

GitHub Features

1 GitHub Pages
Host a static website directly from a GitHub repository. Use it for a portfolio or project demo.
Steps:

  • Go to the repository settings.
  • Enable GitHub Pages under the Pages section.

2 Insights and Analytics
View contributor stats, commit history, and activity graphs.Helps understand how a project evolves and who contributes the most.

3 GitHub Discussions
A forum-like feature for open-ended discussions.For brainstorming or getting help without creating issues.

4 Security Features

  • Dependabot Alerts: Scans for vulnerabilities in dependencies.
  • Code Scanning: Detects security issues in your code.

Conclusion

Thank you for reading this blog till the end! I hope it gave you a clear understanding of Git and GitHub, from the basics to essential commands, collaboration, and exploring GitHub’s powerful features. With these skills, you’re now well-equipped to start contributing to projects, managing your own repositories, and collaborating effectively with others. 🚀

What can you do now?

  • Begin experimenting with Git commands and workflows in your own projects.
  • Contribute to an open-source project to solidify your learning.
  • Explore GitHub’s advanced features like GitHub Actions or Pages to level up your skills. If you found this blog helpful, let’s connect! You can follow me on X (formally twitter) and LinkedIn to stay updated with my journey and future blogs.

Stay tuned for my next blog, where I’ll dive deeper into diffrent topics. Until then, happy coding! 😊

Top comments (0)

Read next

abhivyaktii profile image

Webhook: A Beginner’s Guide 🌐🔗

Abhinav -

suheldevs profile image

How to Optimize Your React Web App: 7 Essential Steps

Mohd Suhel -

cordlesswool profile image

How to use generics in pipe-and-combine

Wolfgang Rathgeb -

prince_beec5ccde00b7c6c73 profile image

✨ Interactive OTP Input with Validation!

Prince -