Learn Everything About Git and GitHub

---

👉 Click The Desire Content

Content List

• 💻 Installation
• 🧑‍💻 Setting up Git Environment
• 🔔 Git Commands List
• ⬆️ Upload a file or folder to Github
• 🤡 Clone a Git repository
• 👊 Push a file to remote repository
• 👨‍🔧Track or Unstage a file in local repository
• 🔀 Revert or Undo any commit
• 🌳 Git Branching
• 🥱 Git Pull - Fetch - Merge
  • 🌿 Update a branch from main branch
  • 🏠 Update a main branch in local repository
  • 🤞 Git Pull vs Fetch-Merge
• 🌚 Create a Pull Request
• 🕸️ Hosting a website using GitHub Pages
• 👑 How to write commit message like PRO
• ✌️ Git Commit Message Type
• 🥹 GitHub Related Problems and Solutions
  • ⚠️ Git Server Connection Error : Fixed
  • ⛑️ Restore a Deleted Depository
• 🍕 How to make a Git Commit with a Past Date
• 🤷‍♀️ What is Git-Ignore and How To Use It !
• 🎀 How To Add Video, Audio and GIFs Files directly in README.md File
• 💁 Contribute to Open Source repository in GitHub
  • 🍔 Fork and Clone Repository
  • 🌭 Remote "Origin" and "UpStream"
  • 🍿 Pull and Push change to upstream
  • 🥗 Create new branch for contributing
  • 🥪 Create a pull request
  • 🥩 Tips for contributing in Open Source Project
  • 🥶 Collaboration with Others
  • 🌮 How to give access permissions of your repository to other
  • 😷 Wrtting a Issue in the Project Repository
  • 🤯 Resources for Finding an Open-Source Program Contribution
• 🎅 How to Resolving Merge Conflicts ?
• ⚔️ How To Edit Pushed Git Commit Message?
  • ❤️‍🩹 Edit The ⭐ Last ⭐ Pushed Git Commit Message
  • 🍂 Edit The ⭐ Any ⭐ Pushed Git Commit Message
• 🫀 How to Roll Back ( Git Reset vs Revert ) a Git Repository to a Particular Commit
  • 🫁 How to Reset a Git Repository to a Specific Commit
  • 😮‍💨 How to Revert a Git Repository to a Specific Commit
• 🤕 Ignore Files Using : .gitignore (How to use the gitignore file)
• 🦖 Tutorial : Documentation of GitHub Readme + Markdown Language
• 🫸 Push an existing Git repository to a different remote repository server?

---

Tips - 1

💻 Installation

• How to Create GitHub Account Step by Step (👉Tutorial Link)
• Git (👉Download)
• How to install Git Step by Step (👉Tutorial Link)
• GitHub Desktop (👉Download)
• How to install GitHub Desktop Step by Step (👉Tutorial Link)

Tips - 2

🧑‍💻 Setting up Git Environment

🎥 Video Tutorial : (👉Click Here)

1. Open Git Bash

2. Write The Following Commands

   • Set Name : git config --global user.name "Gihub User Name"
   • Set Email : git config --global user.email "Github Email"
   • Check status : git config --list

3. Setting Done Successfully

Tips - 3

🔔 Git Commands List

Command	Description
👉 git init	✍️ Initialize a new repository
	git init
👉 git clone	✍️ Clone a remote repository
	git clone https://github.com/example/repo.git
👉 git add	✍️ Stage file changes
	git add file.txt
	git add .
👉 git commit	✍️ Commit changes with a descriptive message
	git commit -m "Added new feature
👉 git status	✍️ Check repository status
	git status
👉 git push	✍️ Push committed changes to a remote repository
	git push origin main
👉 git pull	✍️ Fetch and merge changes from a remote repository
	git pull origin main
👉 git branch	✍️ List of all branches
	git branch
👉 git checkout	✍️ Switch to a different branch
	git checkout new-feature
👉 git merge	✍️ Merge a branch into the current branch
	git merge new-feature
👉 git log	✍️ View git commit history
	git log
👉 git remote	✍️ Add remote repository
	git remote add upstream https://github.com/upstream/repo.git
👉 git diff	✍️ Show differences between files
	git diff file1.txt file2.txt
👉 git reset	✍️ Unstage a file
	git reset file.txt

Tips - 4

⬆️ Upload a file/folder to Github

🎥 Video Tutorial : (👉Click Here)

✍️ Blog Guide Step by Step : (👉Click Here)

1. First Create a repository in Github : (👉How To Create Repository : YouTube) (👉Blog Link)
2. Select the folder that you want to upload
3. Open Gitbash for that folder ( Right click on the folder and open git bash)
4. Now write the following Code in Gitbash terminal
5. Initialize it with git-specific functions : git init
6. Git isn't aware of these file, stage it : git add .
7. Take a snapshot of the staging area : git commit -m "Commits Names"
8. Select the master branch : git branch -M main
9. Provide the path for the repository you created on github : git remote add origin " Git Repository Link"
10. Push changes to github : git push -u origin main
11. Use any of this if the above code not works
    • git push origin master --force
    • git push --set-upstream origin main

Tips - 5

🤡 Clone a git repository and push a file to that repository

✍️ Blog Link Step By Step: (👉Click Here)

1. Copy the url link of the git repository
2. Open Git Bash and run the following command
3. Clone the repository : git clone "RepositoryLink"
   • Code - 1 : git clone https://github.com/link.git
   • Want to clone into Specific Path
     • Code Format : git clone "RepositoryLink" "Location Path"
     • Example : git clone https://github.com/link.git ./Test
     • Note : git init to that folder
     • Clone to current folder: git clone https://github.com/example/example.git ./
4. Code - 2 : cd "Git Repository Name"
5. Code - 3 : git remote -v
6. (Folder Location) Code - 4 : pwd
   • pwd = print working directory
7. Create a new file in that location(text.txt)

Tips - 6

👊 Push any files to the remote working directory

8. Now check the status of your untracked files
   • Code - 5 :git status
9. Add your new file to the local project
   • Code - 6 :git add text.txt
10. Commit the changes to the local project
    • Code - 7 :git commit -m "Commit Name"
11. Finally, push the changes to the remote GitHub repository
    • Code - 8 :git push"
    • Force Push:git push -f"

Tips - 7

👨‍🔧 Track an untracked file

✍️ Blog Link Step By Step: (👉Click Here)

1. Create a new file to in any local git repository
2. Check the new file is tracked or untracked
   • Code - 1 :git status
3. If untracked , then allow to track or stage the file
   • Code - 2 :git add "file name"
4. Now GitHub is tracking the file

✈️ Unstage a tracked file

1. Run git status to select which file you want to unstage
   • Code - 1 :git status
2. Code - 2 :git reset -- "file name"
3. Unstaging file successfully

Tips - 8

🔀 Revert or Undo any Commit

✍️ Blog Link Step By Step: (👉Click Here)

1. Indetifying the commit
   • Code - 1 :git log
2. Now copy the hash code of the commit want to revert
3. Write the following code
   • Code - 2 :git checkout "Hash Code"

Tips - 9

🌳 Git Branching

🎥 Video Tutorial : (👉Click Here)

✍️ Blog Guide Step by Step : (👉Click Here)

🆚 Branching Using VsCode : (👉Click Here)

💻 Branching Using GitHub Desktop : (👉Click Here)

🔛 Branching Using Git Bash👇

1. Check Current Branches
   • Code - 1 :git branch
2. Create a new branch
   • Code - 2 :git branch New_Branch_Name
3. Switch to the new branch
   • Code - 3 :git checkout New_Branch_Name
4. If you want to switch to a main branch
   • Code - 4 :git checkout main
5. Rename the branch you created
   • First Switch to the branch want to rename
   • Code - 5 :git branch -m new-name
6. Delete a branch
   • Local Branch : git branch -d branch_name
   • Another Way : git push origin --delete branch_name
   • Remote Branch : git push origin --delete branch_name
7. Check Branch Status
   • Code - 6 :git branch

Tips - 10

🥱 Git Pull - Fetch - Merge

---

Tips - 11

🌿 Update a branch from main branch

✍️ Blog Link Step By Step: (👉Click Here)

1️⃣ Way - 1 (Fetch-Merge)

1. Check Branch
   • Code - 1 :git branch
2. Choose the brance you want to update from main branch
   • Code - 2 :git checkout Branch_Name
3. Fetch Orgin or Maser Branch
   • Code - 3 :git fetch origin
4. Merge Orgin or Maser Branch into current branch
   • Code - 4 :git merge origin

2️⃣ Way - 2 (Pull)

1. Check Branch
   • Code - 1 :git branch
2. Choose the brance you want to update from main branch
   • Code - 2 :git checkout Branch_Name
3. Pull from master branch
   • Code - 3 :git pull origin master

Tips - 12

🏠 Update a main branch in local repository

✍️ Blog Link Step By Step: (👉Click Here)

1️⃣ Way - 1 (Fetch-Merge)

1. Check Branch
   • Code - 1 :git branch
2. Choose the main brance
   • Code - 2 :git checkout main
3. Fetch Orgin or Maser Branch
   • Code - 3 :git fetch
4. Merge Orgin or Maser Branch
   • Code - 4 :git merge

2️⃣ Way - 2 (Pull)

1. Check Branch
   • Code - 1 :git branch
2. Choose the brance main branch
   • Code - 2 :git checkout Branch_Name
3. Pull from master branch
   • Code - 3 :git pull
   • Force Pull :git pull origin master

Tips - 13

🤞 Git Pull vs Fetch-Merge

🎥 Video Tutorial : (👉Click Here)

Tips - 14

⚓ Create a Pull Request

✍️ Blog Link Step By Step: (👉Click Here)

🎥 Video Tutorial : (👉Click Here)

1. Create a any file in local repository
2. Switch to another or new brance from main branch
   • Code - 1 :git checkout -b newbranch
3. Check Branch
   • Code - 2 :git branch
4. Check files commit status
   • Code - 3 :git status
5. Stage untracked files
   • Code - 4 :git add .
6. Commit the untracked files
   • Code - 5 :git commit -m "commit name"
7. Push to remote repository with new branch
   • Code - 6 :git push origin newbranch
8. Now do the following Steps 👉Click Here

Tips - 15

🕸️ Hosting a website using GitHub

1️⃣ What is github pages ? : (👉Click Here)

2️⃣ (Html - CSS - Javascript) Host a static website : (👉Click Here)

3️⃣ (Only readme.md) Host a static website : (👉Click Here)

4️⃣ (NPM Based) Host a react website : (👉Click Here)

🍀 Setup NPM & NodeJs (👉Click Here)

Tips - 16

👑 How to write commit message like PRO

🧐 Committing Ways

Basic Way	Advanced Way
git commit -m <message>	git commit -m <title> -m <description>

🥱 Format : [FEAT] Commit Message

✍️ 6 Steps to Write Better Commit Messages

1️⃣ Capitalization & Punctuation

👉 Capitalize the first word and do not use in punctuation end
👉 Example :
    ❌❌ adding menu bar.
    ✅✅ Adding menu bar

2️⃣ Show & Express Your Mood

👉 Use imperative mood in the subject line
👉 Example :
    ❌❌ dark mode toggle state
    ✅✅ Add fix for dark mode toggle state

3️⃣ Specify The Type of Commit

👉 Use consistent set of words to describe your changes
👉 Example :
    ✅✅ Bugfix , Update , Refactor

4️⃣ Think like a Journalist

👉 Be direct, try to eliminate filler words and phrases like (like : though, maybe, I think, kind of)
👉 Example :
    ❌❌ I added dark mode and maybe it has some issue
    ✅✅ Add fix for dark mode toggle state

5️⃣ Add Emote Start of The Committ

👉 It creates a beautiful expression of the commit
👉 Example :
    ❌❌ Add fix for dark mode toggle state
    ✅✅ ➕ Add fix for dark mode toggle state

 ⚠️ NT : Since emojis use special ASCII codes (not commonly used and supported in the text-based interfaces like CLIs) and Unicode systems and most command-line interfaces need a third-party package or font to handle them, this convention might not look good to everyone. They might face some issues in terms of reading histories and checking the commit messages. (Like the emoji character in the message title might be rendered as its actual ASCII code or unknown question marks)

6️⃣ Convetional Keyword First

👉 Use a conventional Keyword first : Then explain the commit in detail
👉 Convetional Keywords like
    - feat , fix , chore
    - update , refactor , remove
    - docs , style
    - test , build , revert
👉 Example :
    ❌❌ fixed bug on landing page
    ✅✅ ➕ Fix: fix bug on landing page

Tips - 17

✌️ Git Commit Message Type

🥱 Format : [FEAT] Commit Message

1️⃣ Introducing New Features : "feat"

    👉 Format : git commit -m "feat: message"

✍️ When you add an existing new feature, use 'feat' commit type. It helps team members identify and track significant changes easily.

---

2️⃣ Fixing Bugs: "fix"

    👉 Format : git commit -m "fix: message"

✍️ Addressing a bug ? Utlize 'fix' commit type to highlight that the commit resolves an issue or a problem in the repository code base

---

3️⃣ Miscellaneous Changes: "chore"

    👉 Format : git commit -m "chore: message"

✍️ For non-feature/non-fix updates like updating dependencies or performing routine tasks, use 'chore' commit type

---

4️⃣ Code Refactoring : "refactor"

    👉 Format : git commit -m "refactor: message"

✍️ When you improve the structure or readability of the code without adding features or fixing bugs, use 'refactor' commit type

---

5️⃣ Documentation Updates: "docs"

    👉 Format : git commit -m "docs: message"

✍️ Updating project documentation? Whether it's the README or other relevant files , 'docs' commit type keeps the documentation up to date

---

6️⃣ Code Formatting: "style"

    👉 Format : git commit -m "style: message"

✍️ For changes that don't affect code behavior but enhance code style or formatting , use 'style' commit type

---

7️⃣ Testing Updates: "test"

    👉 Format : git commit -m "test: message"

✍️ When you add or modify tests to ensure code quality and reliability , use 'test' commit type to keep track testing effort

---

8️⃣ Performance Improvements: "perf"

    👉 Format : git commit -m "perf: message"

✍️ Did you optimize the code to boost performance? Use 'perf' commit type

---

9️⃣ Continuous Integration: "ci"

    👉 Format : git commit -m "perf: message"

✍️ Changes related to continuous integration, such as configuring pipelines or adjusting build process, should use the 'ci' commit type

---

🔟 Build System Updates: "build"

    👉 Format : git commit -m "build: message"

✍️ For changes impacting the build system or external dependencies such as package updates or build script modification , use 'build' commit type

---

1️⃣1️⃣ Reverting Changes: "revert"

    👉 Format : git commit -m "revert: message"

✍️ Mistakes happen! if you need to undo a previous commit , use 'revert commit type to roll back changes and restore the previous states

Tips - 18

🥹 GitHub Related Problems and Solutions

1️⃣ Problem - 1 : Git Server Connection Error : Fixed

🕵️ Description: "Failed to connect to github.com port 443: Connection timed out" when pushing to remote repository

• 👉 Solution : Write the following command into GitBash
  • git config --global http.proxy
  • git config --global --unset https.proxy

  ---

2️⃣ Problem - 2 : Restore a Deleted Repository

🕵️ Description: Mistakenly deleted an important repository

• 👉 Solution : Blog Link Step By Step (👉Click Here)

Tips - 19

🍕 How to make a Git Commit with a Past Date

🎥 Video Tutorial : (👉Click Here)

👇 Command Line 👇

1. Add all file from current repository
   • Code - 1 :git add .
2. Stage all files using commit command
   • Code - 2 :git commit -m "Commit Message Type"
3. To commit with your desire date use the following command with Time
   • Code - 3 :git commit --amend --date="2023-07-07 20:12:20"
4. Git Gui will take you to another page
5. Now juust press Esc and type :wq then press Enter
6. Now push the commit
   • Code - 4 : git push origin master
7. Successfully committed with a random date

Tips - 20

🤷‍♀️ What is Git-Ignore and How To Use It !

✍️ Blog Link Step By Step: (👉Click Here)

👇 What is git-ignore 👇

There are various types of files we might want the git to ignore before committing, for example, the files that are to do with our user settings or any utility setting, private files like passwords and API keys. These files are not of any use to anyone else and we do not want to clutter our git. We can do this with the help of “.gitignore”

.gitignore is an auto-generated file inside the project folder that ignores/prevents files to get committed to the local and remote repositories.

👇 Command Line 👇

1. Create .gitignore File inside the project folder.
2. Assume I have files name
   • a.txt , b.txt , c.txt , text.txt
3. Write the name of the files you want to ignore in the .gitignore text file. Each file name should be written in a new line .
   • text.txt
4. Initialize git in your terminal. Add these files to your git repository and commit all the changes with an appropriate message.
   • git init
   • git add .
   • git commit - m "Testing Git Ignore"
   • git push
5. Using Git-Ignore will not commit the file name text.txt further and commit the rest of files

👇 Some common patterns and format for Git-Ignore 👇

• Blank Line: A blank line doesn’t refer to any file name, so we can use it to separate two file names for the ease of reading .

• #: A line beginning with the # symbol refers to a comment .However if # is used as a pattern then use backslash (“\”) before the # symbol so that it is not misunderstood as a comment.

• /: It is used as a directory separator i.e to include directories, for example webdev/ .

• *.extension_name: For example _.txt and _.log can be used to match ALL the files that have .txt and .log as their extension respectively.

• **/any_name: It is used to match any file or directory with the name any_name.

• any_name/**: It is used to match anything that is inside the directory of the name - any_name. for example webdev/** matches all the files inside webdev directory.

# Compiled class file                  // Comment
*.class                                // Ignore Extension Type

# Log file
*.log

# Mobile Tools for Java (J2ME)
.mtj.tmp/                              // Extension Directory Type

# Package Files
*.jar

Tips - 21

🎀 How To Add Video, Audio and GIFs Files directly in README.md File

🎥 Add Videos on README.md File: (👉Click Here)

🎶 Add Audio on README.md File: (👉Click Here)

📸 Add Images on README.md File: (👉Click Here)

💃 Add GIFs on README.md File: (👉Click Here)

🧠 Add images and links in Markdown by dragging and dropping in VSCode: (👉Click Here)

Tips - 22

💁 Contribute to Open Source repository in GitHub

📻 Video Guide - Contributing to Open Source : (👉Click Here)

✍️ Step-by-step guide to contributing on GitHub : (👉Click Here)

✍️ Example Code Overview of Contributing to an existing repository : (👉Click Here)

🎥 Video Tutorial - How To Contribute in 3 Minutes : (👉Click Here)

🏠 Open Source BootCamp - Master Open Source Contributions : (👉Click Here)

🔍 How to Find the Best Repositories for Open Source Contribution : (👉Click Here)

🔍 How to Earn with Open Source Contributions : (👉Click Here)

📭 Open Source Crash Course - Beginner Guide to Open Source : (👉Click Here)

✍️ Open Source Crash Course Notes : (👉Click Here)

✍️ Top 10 Mistakes in Open Source Contribution World : (👉Click Here)

---

😊 Step 1: Fork The Repository

🎥 Fork a git repository : (👉Click Here)

➡️ Find the project's repository on GitHub
➡️ Then "fork" it by clicking the Fork button in the upper right corner

This creates a copy of the project repository in your GitHub account.
In the upper left corner, you will see that you are now looking at a repository in your account:

😏 Step 2: Clone your forked repository

🎥 Clone a repository with GitHub Desktop : (👉Click Here)

➡️ While still in your repository, click the green Clone or download button
and then copy the HTTPS URL

Using Git on your local machine, clone your fork using the URL you just copied:
" git clone URL_OF_FORK "

Clone the repository you want to contribute from in your machine ( Copy the repository Link and Write the following code in Git Bash )

git clone https://github.com/Sumonta056/GitHub-Tutorial.git

🍔 Step 3: Navigate to Your Local Repository

Since the clone was downloaded into a subdirectory of your working directory, you can navigate to it using:

cd GitHub-Tutorial

🌭 Step 4: Check that your fork is the "origin" remote

You are going to be synchronizing your local repository with both the project repository (on GitHub) and your fork (also on GitHub). The URLs that point to these repositories are called "remotes". More specifically, the project repository is called the "upstream" remote, and your fork is called the "origin" remote.

When you cloned your fork, that should have automatically set your fork as the "origin" remote. Use git remote -v to show your current remotes

git remote -v

You should see the URL of your fork (which you copied in step 2) next to the word "origin".

If you don't see an "origin" remote, you can add it using: git remote add origin URL_OF_FORK.

git remote add origin https://github.com/Sumonta056/GitHub-Tutorial.git

🍿 Step 5: Add the project repository as the "upstream" remote

Add the project repository as the "upstream" remote using: git remote add upstream URL_OF_PROJECT.

git remote add upstream https://github.com/scikit-learn/scikit-learn.git

🥗 Summary of Step 1 - 5

🥪 Step 6: Pull the latest changes from upstream into your local repository

Before you start making any changes to your local files, it's a good practice to first synchronize your local repository with the project repository. Use git pull upstream master to "pull" any changes from the "master" branch of the "upstream" into your local repository. (If the project repository uses "main" instead of "master" for its default branch, then you would use git pull upstream main instead.)

git pull upstream master

git pull upstream main

If you forked and cloned the project repository just a few minutes ago, it's very unlikely there will be any changes, in which case Git will report that your local repository is "already up to date". But if there are any changes, they will automatically be merged into your local repository.

🥩 Step 7: Create a new branch

Rather than making changes to the project's "master" branch, it's a good practice to instead create your own branch. This creates an environment for your work that is isolated from the master branch.

1. Create a new branch to store any new changes

git branch branch-name

2. Switch to that branch you created

git checkout branch-name

Use git branch to show your local branches. You should see your new branch as well as "master", and your new branch should have an asterisk next to it to indicate that it's "checked out" (meaning that you're working in it).

git branch

🌮 Step 8: Make changes in your local repository

Use a text editor or IDE to make the changes you planned to the files in your local repository. Because you checked out a branch in the previous step, any edits you make will only affect that branch.

🍢 Step 9: Commit your changes

After you make a set of changes, use git add . to stage your changes and git commit -m "DESCRIPTION OF CHANGES" to commit them. Make changes. For example, I am creating a two file "file1.md" and "file2.md"

1. Select the changed files

git add file1.md file2.md

2. Take a snapshot of the staging area (anything that's been added)

git commit -m "my snapshot"

If you are making multiple sets of changes, it's a good practice to make a commit after each set.

🫕 Step 10: Push your changes

When you are done making all of your changes, upload these changes to your fork using git push origin BRANCH_NAME. This "pushes" your changes to the "BRANCH_NAME" branch of the "origin" (which is your fork on GitHub).

Use any of the following code of pushing to repository

git push origin branch-name

git push --set-upstream origin my-branch

🍪 Step 11: Begin the pull request

Return to your fork on GitHub, and refresh the page. You may see a highlighted area that displays your recently pushed branch:

Click the green Compare & pull request button to begin the pull request.

(Alternatively, if you don't see this highlighted area, you can switch to your branch using the Branch button and then click the New pull request button.)

🥖 Step 12: Create the pull request

✍️ How to create a pull request in GitHub : (👉Click Here)

🎥 Video Tutorial - How To Pull Request in 3 Minutes : (👉Click Here)

🎊 Step 13: Congratulations!

Congratulations on making your first open source contribution! 🎉

---

🍂 Tips for contributing in Open Source Project

If you're ready to start making code contributions (beyond just fixing typos), here are a few tips:

1. Browse through a repository's open issues (especially ones labeled "good first issue") to see if there is an issue you might be able to solve.
2. If you're planning to contribute code that is unrelated to an existing issue, it's a good idea to open a new issue describing your proposal before starting work on it. The project maintainers might give you feedback that will help to shape your work, which will ultimately increase the likelihood that your pull request will be accepted.
3. Read the project's contributing guide, which will usually be in the GitHub repository or the project documentation. It will likely contain many helpful tips for how to successfully contribute to the project.ing your first open source contribution!

---

🥶 Collaboration with Others

📺 Video Tutorial : How to do Collaboration (👉Click Here)

🎥 How to give access permissions of your repository to other (👉Click Here)

---

😷 Wrtting a Issue in the Project Repository

❓ What is GitHub Issues? (👉Click Here)

📺 Video Tutorial : How To Create Issue in Repository (👉Click Here)

🎥 How To Create Issue Templete in Own Repository (👉Click Here)

---

🤯 Resources for Finding an Open-Source Program Contribution

• 🔍 GitHub Explore : 👉 Click Here
• 🎁 Up for Grabs : 👉 Click Here
• 🍁 HacktoberFest Projects : 👉 Click Here
• 🌟 Ovio Projects : 👉 Click Here
• 🚀 Good First Issues : 👉 Click Here
• 🌐 Google Summer of Code : 👉 Click Here
• 🌈 Outreachy : 👉 Click Here
• 🌌 MLH Fellowship : 👉 Click Here
• 🌍 Google For Developers : 👉 Click Here
• 🌞 GNOME Summer of Code : 👉 Click Here

Tips - 23

🎅 How to Resolving Merge Conflicts ?

🎥 Tutorial Resolving Merge Conflicts (With Example): (👉Click Here)

🤧 What is a Git Merge Conflict?

A merge conflict is an event that takes place when Git is unable to automatically resolve differences in code between two commits. Git can merge the changes automatically only if the commits are on different lines or branches.

The following is an example of how a Git merge conflict works:

Let’s assume there are two developers: Developer A and Developer B. Both of them pull the same code file from the remote repository and try to make various amendments in that file. After making the changes, Developer A pushes the file back to the remote repository from his local repository. Now, when Developer B tries to push that file after making the changes from his end, he is unable to do so, as the file has already been changed in the remote repository.

To prevent such conflicts, developers work in separate isolated branches. The Git merge command combines separate branches and resolves any conflicting edits.

✍️ Step by Step Blog to Resolve Merge Conflicts : (👉Click Here)

🍂 Some Git Commands to Resolve Merge Conflicts

  👉 Format : git log --merge
  ✍️ This command helps to produce the list of commits that are causing the conflict.

  👉 Format : git diff
  ✍️ This command helps to identify the differences between the states repositories or file

  👉 Format : git checkout
  ✍️ This command is used to undo the changes made to the file, or for changing branches..

  👉 Format : git reset --mixed
  ✍️ This command is used to undo changes to the working directory and staging area

  👉 Format : git reset --mixed
  ✍️ This command helps in exiting the merge process and returning back to the state before the merging began.

  👉 Format : git reset
  ✍️ This command is used at the time of merge conflict to reset the conflicted files to their original state.

  👉 Format : git status
  ✍️ This command displays the current state of the working directory and the repository.
  ✍️ It shows which files are modified, untracked, or staged for commit.

  👉 Format : cd documentss
  ✍️ 'cd' is used to change the current working directory in the command line..

  👉 Format : cat file.txt
  ✍️ 'cat' stands for "concatenate" and is used to display the contents of a file..

  👉 Format : vi example.txt
  ✍️ 'vi' is a text editor available on Unix-like operating systems.
  ✍️ It allows you to create and edit files from the command line.

  👉 Format : git rebase origin master
  ✍️ This command is used to reapply commits on top of another branch
  (usually master) to incorporate changes and keep a linear commit history..

  👉 Format : git rebase --abort
  ✍️ This command aborts an ongoing rebase operation,
  reverting the repository back to its original state before the rebase.

  👉 Format : git merge branch-name
  ✍️ This command merges changes from one branch into another.

  👉 Format : git mergetool
  ✍️ This command launches a merge resolution tool
   to help resolve conflicts during a merge or rebase.

  👉 Format : git rebase --continue
  ✍️ This command continues a rebase operation after
  resolving conflicts in the conflicted files.

Tips - 24

⚔️ How To Edit Pushed Git Commit Message?

🎥 Tutorial How To Edit Pushed Git Commit Message: (👉Click Here)

---

❤️‍🩹 Edit The ⭐ Last ⭐ Pushed Git Commit Message (👉Tutorial )

1. ✍️ Open Git Terminal of Your Project

git commit --amend

2. ✍️ New Window will open where in top you see the last commit message

3. ✍️ Write the following commands

Press ESC

4. ✍️ To Edit the Message

 Press I

5. ✍️ Now you can edit the Last Pushed Git Commit Message. After edit do this :

Press ESC

Press SHIFT + Z + Z

6. ✍️ Now Push the Git Updated Commit Message

git push -f

7. 🥳 Successfully Updated the Last Commit Message

---

🍂 Edit The ⭐ Any ⭐ Pushed Git Commit Message (👉Tutorial )

1. ✍️ Open Git Terminal of Your Project

git rebase -i HEAD~5

[Here 5 = How Many last commit you want to see]

2. ✍️ New Window will open where in top you see the all last commit message upto 5

3. ✍️ Choose the desire commit Then

Press ESC

4. ✍️ You will see "PICK" key word before your desire commit mesaage

Press I

5. ✍️ Modify the "PICK" keyword to "Edit". After modifying do this :

Press ESC

Press SHIFT + Z + Z

6. ✍️ Now write the following command

git commit --amend

7. ✍️ To Edit The Last Selected Message

 Press I

8. ✍️ Now you can edit the selected Pushed Git Commit Message. After edit do this :

Press ESC

Press SHIFT + Z + Z

9. ✍️ Now Push the Git Updated Commit Message

git push -f

10. ✍️ Now write the following command

git push origin HEAD:main

git branch -M main

git rebase --continue

11. ✍️ Now do a final push

git push -f

12. 🥳 Successfully Updated the Selected Commit Message

Tips - 25

🫀 How to Roll Back ( Git Reset vs Revert ) a Git Repository to a Particular Commit

✍️ Blog Guide Step by Step Git Reset: (👉Click Here )

🎥 Video Tutorial Git Revert vs Reset: (👉Click Here )

---

⛑️ Git reset and git revert are not the same.

Git reset will undo changes up to the state of the specified commit ID. For example, reverting to the second commit ID will undo changes and leave the state of the file as the state of the second commit. Ggit revert will undo changes up to the state before the specified commit ID. For example, reverting to the second commit ID will undo changes and leave the state of the file as the state of the commit that comes before the second commit – the first commit.

The explanations above may seem confusing. The best way to understand it is to try it out yourself.

🎡 When to Use git reset and git revert

You should use git reset when working on a local repository with changes yet to be pushed remotely. This is because running this command after pulling changes from the remote repo will alter the commit history of the project, leading to merge conflicts for everyone working on the project.

Git reset is a good option when you realize that the changes being made to a particular local branch should be somewhere else. You can reset and move to the desired branch without losing your file changes.

Git revert is a good option for reverting changes pushed to a remote repository. Since this command creates a new commit, you can safely get rid of your mistakes without rearranging the commit history for everyone else.

---

⚠️ Reset Only Works for Local Commits

🫁 How to Reset a Git Repository to a Specific Commit (👉Tutorial )

👉 Step - 1 : View and Check Git Commit History

git log --oneline

👉 Step - 2 : Choose a particular commit and its copy SHA-hash

We have selected the “Files added” commit, whose hash value is “9bd11a3”

👉 Step - 3 : Reset to Particular Commit : Run the “git reset –hard ” command

git reset --hard 9bd11a3

👉 Step - 4 : Next Do the following command things

git add .
git commit -m "Your Message"
git push origin main

🍭 Step - 5 : Successfully Reset to Particular Commit

---

⚠️ Revert Only Works for Public/Remote Commits

😮‍💨 How to Revert a Git Repository to a Specific Commit (👉Tutorial )

👉 Step - 1 : View and Check Git Commit History

git log --oneline

👉 Step - 2 : Choose a particular commit and its copy SHA-hash

We have selected the “Files added” commit, whose hash value is “9bd11a3”

👉 Step - 3 : Revert to Particular Commit

git revert 9bd11a3

👉 Step - 4 : New Screen will come then type any of below code

Type "Esc"
Type "SHIFT + Z + Z"

Type ":wq"

🍭 Step - 5 : Successfully Revert to Particular Commit

Tips - 26

🤕 Ignore Files Using : .gitignore (How to use the gitignore file)

🎥 How to Ignore Different File in Git Ignore : (👉 Video Link )

✍️ Prebuilt .gitIgnore Files for Different Language Projects: (👉Click Here )

Tips - 27

🦖 Tutorial : Documentation of GitHub Readme + Markdown Language

 git add README.md

Learn Markdown Langaue

✍️ Markdown Language Documenation Learning (Mine) : (👉Click Here )

🎥 Markdown Clean Sheet : (👉Click Here )

✍️ Learn Markdown Language with Practice Test : (👉Click Here )

✍️ Narkdown Guide Advance Level Everything : (👉Click Here )

---

Readme Design Tools Advance

✍️ Readme Table Basic Rules : (👉Click Here )

✍️ Github Readme Table Style : (👉Click Here )

✍️ Cools GIF For GitHub Readme : (👉Click Here )

---

GitHub Profile Readme Design Tools and Useful Website

🎥 Design Your GitHub Profile : (👉Click Here )

✍️ Awesome GitHub Profile README (GitHub + Website) : (👉Click Here )

✍️ Github Readme Activity Graph : (👉Click Here )

✍️ All GitHub Readme Stats (All in One): (👉Click Here )

🛺 GitHub Readme Profile Generator 1: (👉Click Here )

🛺 GitHub Readme Profile Generator 2: (👉Click Here )

🛺 GitHub Readme Profile Generator 3: (👉Click Here )

🛺 GitHub Readme Profile Generator 4: (👉Click Here )

✍️ Beautify GitHub Profile ( Everything - Badges - Widgets - Icons - Profile Generators) : (👉Click Here )

Automation Update Using GitHub Action and Workflows

✍️ Dev Metrics in Readme (Simple) : (👉Click Here )

✍️ Dev Metrics in Readme with added feature flags 🎌 : (👉Click Here )

✍️ Blog post workflow : (👉Click Here )

Tips - 28

🫸 Push an existing Git repository to a different remote repository server?

✍️ Stackoverflow - Push an existing Git repository : (👉Click Here )

1. Create a new repo at GitHub.

2. Navigate to your local Git repository in your terminal.

cd /path/to/your/repoin

3. Rename the original remote to 'upstream'.

git remote rename origin upstream

4. Add the new GitHub repo as 'origin'.

git remote add origin URL_TO_NEW_GITHUB_REPO

5. Push the changes to the new 'origin' remote repository.

git push origin main