From c2b6988289bbc376b52887eba447043a3a1a147c Mon Sep 17 00:00:00 2001 From: Obiechina Emmanuel <94564639+chibuike-19@users.noreply.github.com> Date: Thu, 15 Aug 2024 02:13:08 +0100 Subject: [PATCH] Add content to git/github roadmap (#6566) * Added content to custom-validators topic * Added contents to 10 git & github topics * Apply suggestions from code review styling clean up * Added contents to 10 git and github topics * Update src/data/roadmaps/git-github/content/committing-changes@2_z3R7seCvQVj-Na4H1SV.md * Update src/data/roadmaps/git-github/content/creating-account@i7fIIHcBEk473te8bniJ5.md * Update src/data/roadmaps/git-github/content/creating-branch@OegitQ5Ngjvd3ZfMpfrkM.md * Update src/data/roadmaps/git-github/content/creating-repositories@c_FO6xMixrrMo6iisfsvl.md * Update src/data/roadmaps/git-github/content/deleting-branch@1uDenoQ6zu7CT69FR2iQB.md * Update src/data/roadmaps/git-github/content/fast-forward-vs-non-ff@agtPWS8j6i6wQPk10cy8E.md * Update src/data/roadmaps/git-github/content/forking-vs-cloning@l1Wf7Pe_ah8ycCgslfSK4.md * Update src/data/roadmaps/git-github/content/git-rebase@HMEfUFNu_Wp_Pac7VWHr-.md --------- Co-authored-by: dsh Co-authored-by: Kamran Ahmed --- .../committing-changes@2_z3R7seCvQVj-Na4H1SV.md | 9 ++++++++- ...ribution-guidelines@pJ-najh7dXhhYA_0bDiR5.md | 11 ++++++++++- .../creating-account@i7fIIHcBEk473te8bniJ5.md | 9 ++++++++- .../creating-branch@OegitQ5Ngjvd3ZfMpfrkM.md | 9 ++++++++- ...eating-repositories@c_FO6xMixrrMo6iisfsvl.md | 8 +++++++- .../deleting-branch@1uDenoQ6zu7CT69FR2iQB.md | 9 ++++++++- ...t-forward-vs-non-ff@agtPWS8j6i6wQPk10cy8E.md | 17 ++++++++++++++++- .../forking-vs-cloning@l1Wf7Pe_ah8ycCgslfSK4.md | 13 ++++++++++++- .../content/git-rebase@HMEfUFNu_Wp_Pac7VWHr-.md | 11 ++++++++++- .../content/git-reflog@hru0sL1-D4bJSQI1efEyU.md | 11 ++++++++++- 10 files changed, 97 insertions(+), 10 deletions(-) diff --git a/src/data/roadmaps/git-github/content/committing-changes@2_z3R7seCvQVj-Na4H1SV.md b/src/data/roadmaps/git-github/content/committing-changes@2_z3R7seCvQVj-Na4H1SV.md index 75326e9da..73d2cf2a7 100644 --- a/src/data/roadmaps/git-github/content/committing-changes@2_z3R7seCvQVj-Na4H1SV.md +++ b/src/data/roadmaps/git-github/content/committing-changes@2_z3R7seCvQVj-Na4H1SV.md @@ -1 +1,8 @@ -# Committing Changes \ No newline at end of file +# Committing Changes + +Committing changes in Git is a crucial part of version control, allowing you to save your progress and record a snapshot of your project's current state + +Learn more from the following resources: + +- [@official@How git commit works](https://github.com/git-guides/git-commit) +- [@article@Git commit](https://www.atlassian.com/git/tutorials/saving-changes/git-commit) diff --git a/src/data/roadmaps/git-github/content/contribution-guidelines@pJ-najh7dXhhYA_0bDiR5.md b/src/data/roadmaps/git-github/content/contribution-guidelines@pJ-najh7dXhhYA_0bDiR5.md index 95ad52307..27171b0c2 100644 --- a/src/data/roadmaps/git-github/content/contribution-guidelines@pJ-najh7dXhhYA_0bDiR5.md +++ b/src/data/roadmaps/git-github/content/contribution-guidelines@pJ-najh7dXhhYA_0bDiR5.md @@ -1 +1,10 @@ -# Contribution Guidelines \ No newline at end of file +# Contribution Guidelines + +Contribution guidelines are essential for collaborative projects on GitHub as they help streamline collaboration, set expectations for contributions, and maintain the project's quality and consistency. + +Learn more from the following resources: + +- [@official@Setting guidelines for respository contributors](https://docs.github.com/articles/setting-guidelines-for-repository-contributors) +- [@official@Contributing Guidelines](https://github.blog/news-insights/contributing-guidelines/) +- [@official@Contributing Guides: A Template](https://github.com/nayafia/contributing-template) +- [@article@How to Build a CONTRIBUTING.md](https://mozillascience.github.io/working-open-workshop/contributing/) diff --git a/src/data/roadmaps/git-github/content/creating-account@i7fIIHcBEk473te8bniJ5.md b/src/data/roadmaps/git-github/content/creating-account@i7fIIHcBEk473te8bniJ5.md index 78d516928..7249c0d07 100644 --- a/src/data/roadmaps/git-github/content/creating-account@i7fIIHcBEk473te8bniJ5.md +++ b/src/data/roadmaps/git-github/content/creating-account@i7fIIHcBEk473te8bniJ5.md @@ -1 +1,8 @@ -# Creating Account \ No newline at end of file +# Creating Account + +To get started with GitHub, you'll need to create a free personal account on GitHub.com and verify your email address. +Every person who uses GitHub.com signs in to a personal account. Your personal account is your identity on GitHub.com and has a username and profile. + +Learn more from the following resources: + +- [@official@Creating an account on GitHub](https://docs.github.com/en/get-started/start-your-journey/creating-an-account-on-github) \ No newline at end of file diff --git a/src/data/roadmaps/git-github/content/creating-branch@OegitQ5Ngjvd3ZfMpfrkM.md b/src/data/roadmaps/git-github/content/creating-branch@OegitQ5Ngjvd3ZfMpfrkM.md index d48885952..71c7dd520 100644 --- a/src/data/roadmaps/git-github/content/creating-branch@OegitQ5Ngjvd3ZfMpfrkM.md +++ b/src/data/roadmaps/git-github/content/creating-branch@OegitQ5Ngjvd3ZfMpfrkM.md @@ -1 +1,8 @@ -# Creating Branch \ No newline at end of file +# Creating Branch + +Creating a branch in Git is a fundamental part of working with version control, allowing you to work on different features or fixes without affecting the main codebase. You can create branches either through the terminal or github interface + +Learn more from the following resources: + +- [@official@Git branch documentation](https://git-scm.com/docs/git-branch) +- [@article@Git branch](https://www.atlassian.com/git/tutorials/using-branches) diff --git a/src/data/roadmaps/git-github/content/creating-repositories@c_FO6xMixrrMo6iisfsvl.md b/src/data/roadmaps/git-github/content/creating-repositories@c_FO6xMixrrMo6iisfsvl.md index e5de0dd96..aa4f59223 100644 --- a/src/data/roadmaps/git-github/content/creating-repositories@c_FO6xMixrrMo6iisfsvl.md +++ b/src/data/roadmaps/git-github/content/creating-repositories@c_FO6xMixrrMo6iisfsvl.md @@ -1 +1,7 @@ -# Creating Repositories \ No newline at end of file +# Creating Repositories + +Creating a Git repository means setting up a system to track changes in your project's files over time. This is crucial for version control, allowing you to manage, review, and collaborate on code efficiently. + +Learn more from the following resources: + +- [@official@Quickstart for repositories - GitHub Docs](https://docs.github.com/en/repositories/creating-and-managing-repositories/quickstart-for-repositories) diff --git a/src/data/roadmaps/git-github/content/deleting-branch@1uDenoQ6zu7CT69FR2iQB.md b/src/data/roadmaps/git-github/content/deleting-branch@1uDenoQ6zu7CT69FR2iQB.md index e0bb1bb2e..e46338704 100644 --- a/src/data/roadmaps/git-github/content/deleting-branch@1uDenoQ6zu7CT69FR2iQB.md +++ b/src/data/roadmaps/git-github/content/deleting-branch@1uDenoQ6zu7CT69FR2iQB.md @@ -1 +1,8 @@ -# Deleting Branch \ No newline at end of file +# Deleting Branch + +Deleting a Git branch means removing a line of development from your Git repository. A branch in Git is essentially a pointer to a specific commit, representing an independent line of development. When you delete a branch, you’re removing this pointer, making that line of development no longer accessible through the branch name. + +Learn more from the following resources: + +- [@official@Creating and deleting branches within your repository](https://docs.github.com/articles/creating-and-deleting-branches-within-your-repository) +- [@article@How to Delete a Git Branch Both Locally and Remotely](https://www.freecodecamp.org/news/how-to-delete-a-git-branch-both-locally-and-remotely/) diff --git a/src/data/roadmaps/git-github/content/fast-forward-vs-non-ff@agtPWS8j6i6wQPk10cy8E.md b/src/data/roadmaps/git-github/content/fast-forward-vs-non-ff@agtPWS8j6i6wQPk10cy8E.md index 2f6bd6f52..9d581cb88 100644 --- a/src/data/roadmaps/git-github/content/fast-forward-vs-non-ff@agtPWS8j6i6wQPk10cy8E.md +++ b/src/data/roadmaps/git-github/content/fast-forward-vs-non-ff@agtPWS8j6i6wQPk10cy8E.md @@ -1 +1,16 @@ -# Fast-Forward vs Non-FF \ No newline at end of file +# Fast-Forward vs Non-FF + +In Git, when you merge branches, there are two primary types of merges: Fast-Forward and Non-Fast-Forward (No-FF). These terms describe how Git handles the history and pointers when merging branches. Understanding the difference between these two types of merges is crucial for managing your project's commit history effectively. + +A Fast-Forward merge occurs when the branch you are merging into (often main or master) has not diverged from the branch you are merging (often a feature branch). In other words, the commit history of the target branch is a strict subset of the branch being merged. In a Fast-Forward merge, Git simply moves the pointer of the target branch forward to the latest commit on the branch being merged. +No new merge commit is created; the history is linear. + +A Non-Fast-Forward (No-FF) merge happens when the target branch has diverged from the branch being merged or when you explicitly choose to create a merge commit. In this case, Git creates a new commit that represents the merging of the two branches. Git creates a new merge commit that has two parent commits: one from the target branch and one from the branch being merged. The merge commit is a snapshot of the merged work, preserving the history of both branches. + +Learn more from the following resources: + +- [@article@Git Fast-Forward VS Non-Fast-Forward](https://leimao.github.io/blog/Git-Fast-Forward-VS-Non-Fast-Forward/) +- [@article@Git Merge: To Squash Or Fast-Forward?](https://dev.to/trpricesoftware/git-merge-to-squash-or-fast-forward-3791) +- [@article@Difference between a git fast forward and no fast forward](https://gist.github.com/moraisaugusto/1fa02c49b6d9833fcdf665505595ac2e) +- [@video@GIT Fast Forward Visualized](https://youtu.be/DN1fNYoJgDw?si=_TZKACj4SCOuESGm) +- [@video@git merge no fast forward](https://youtu.be/X_8atqzsO8U?si=e9hMQg_aWLRMWf4O) diff --git a/src/data/roadmaps/git-github/content/forking-vs-cloning@l1Wf7Pe_ah8ycCgslfSK4.md b/src/data/roadmaps/git-github/content/forking-vs-cloning@l1Wf7Pe_ah8ycCgslfSK4.md index 8180d9670..e1fe12187 100644 --- a/src/data/roadmaps/git-github/content/forking-vs-cloning@l1Wf7Pe_ah8ycCgslfSK4.md +++ b/src/data/roadmaps/git-github/content/forking-vs-cloning@l1Wf7Pe_ah8ycCgslfSK4.md @@ -1 +1,12 @@ -# Forking vs Cloning \ No newline at end of file +# Forking vs Cloning + +Forking and cloning are two fundamental concepts in Git, particularly when working with repositories hosted on platforms like GitHub, GitLab, or Bitbucket. While both actions involve copying a repository, they serve different purposes and have distinct workflows. +Cloning a repository means creating a local copy of a repository that exists on a remote server (e.g., GitHub) on your local machine. This allows you to work on the project locally, make changes, and then push those changes back to the remote repository if you have the necessary permissions. +Forking a repository is specific to platforms like GitHub, GitLab, and Bitbucket. When you fork a repository, you create a copy of someone else’s repository in your own account. This forked repository is independent of the original and can be modified without affecting the original project. + +Learn more from the following resources: + +- [@official@The difference between forking and cloning a repository](https://github.com/orgs/community/discussions/35849) +- [@article@Git fork vs. clone: What's the difference?](https://www.theserverside.com/answer/Git-fork-vs-clone-Whats-the-difference) +- [@video@Git Fork vs. Git Clone: What's the Difference?](https://youtu.be/6YQxkxw8nhE?si=mJNvcaB4lQccsU57) +- [@video@GitHub Forking vs Cloning: Key Differences Explained](https://youtu.be/yQSjqYs2UBE?si=3BKYtWmkLIMWvA6G) \ No newline at end of file diff --git a/src/data/roadmaps/git-github/content/git-rebase@HMEfUFNu_Wp_Pac7VWHr-.md b/src/data/roadmaps/git-github/content/git-rebase@HMEfUFNu_Wp_Pac7VWHr-.md index 1b4d4318d..c37e73eef 100644 --- a/src/data/roadmaps/git-github/content/git-rebase@HMEfUFNu_Wp_Pac7VWHr-.md +++ b/src/data/roadmaps/git-github/content/git-rebase@HMEfUFNu_Wp_Pac7VWHr-.md @@ -1 +1,10 @@ -# git rebase \ No newline at end of file +# git rebase + +Git rebase is a powerful command in Git that allows you to integrate changes from one branch into another. Unlike git merge, which creates a new commit to combine the histories of two branches, git rebase moves or applies commits from one branch on top of another, effectively re-writing the commit history. + +Learn more from the following resources: + +- [@official@Git - git-rebase Documentation](https://git-scm.com/docs/git-rebase) +- [@article@git rebase ](https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase) +- [@video@git rebase - Why, When & How to fix conflicts](https://youtu.be/DkWDHzmMvyg?si=59jauQgkL-sMewzo) +- [@video@Git Rebase --interactive: EXPLAINED](https://youtu.be/H7RFt0Pxxp8?si=gLhfkVW_PmWHBQSs) diff --git a/src/data/roadmaps/git-github/content/git-reflog@hru0sL1-D4bJSQI1efEyU.md b/src/data/roadmaps/git-github/content/git-reflog@hru0sL1-D4bJSQI1efEyU.md index 0f2700f86..5f6131028 100644 --- a/src/data/roadmaps/git-github/content/git-reflog@hru0sL1-D4bJSQI1efEyU.md +++ b/src/data/roadmaps/git-github/content/git-reflog@hru0sL1-D4bJSQI1efEyU.md @@ -1 +1,10 @@ -# Git Reflog \ No newline at end of file +# Git Reflog + +Git reflog is a powerful tool in Git that keeps a record of all the changes made to the branches and commits in your repository, including actions that are not part of the regular commit history, such as resetting branches or checking out commits. It's particularly useful for recovering lost commits or understanding the history of changes in your repository, even if those changes are not reflected in the normal commit history.Reflog stands for "reference log." It records when the tip of branches or other references (like HEAD) is updated in your repository. + +Learn more from the following resources: + +- [@official@Git - git-reflog Documentation](https://git-scm.com/docs/git-reflog) +- [@article@What is the Git Reflog? | Learn Version Control with Git](https://www.git-tower.com/learn/git/faq/what-is-git-reflog) +- [@video@Learn Git Essentials 12: Git Reflog](https://youtu.be/RVu8lpS7JFY?si=eNGBpsYfHtlyPClj) +- [@video@Git Reflog Command. Get all log details of the reference using git reflog show command](https://youtu.be/I4f4pddD16g?si=0Ny7xOJgiPgdfuh6)