conflict merge

devvsakib · devvsakib · commit e3d228a9206a · 2024-07-28T10:17:42.000+06:00
diff --git a/public/posts/index.json b/public/posts/index.json
@@ -0,0 +1,5 @@
+[
+  {
+    "title": "pull_request_tutorial_for_beginners"
+  }
+]
diff --git a/public/posts/pull_request_tutorial_for_beginners.md b/public/posts/pull_request_tutorial_for_beginners.md
@@ -0,0 +1,122 @@
+Pull requests (PRs) are a crucial part of collaborative software development, especially in open-source projects. They allow developers to propose changes to a codebase, which can then be reviewed and discussed by others before being merged. This tutorial will guide you through the process of creating a pull request.
+
+## Prerequisites
+
+- Basic knowledge of Git and GitHub.
+- A GitHub account.
+- Git installed on your computer.
+
+## Step 1: Fork the Repository
+
+1. Navigate to the repository you want to contribute to on GitHub.
+2. Click the "Fork" button at the top right of the page. This will create a copy of the repository under your GitHub account.
+
+## Step 2: Clone Your Fork
+
+Clone the forked repository to your local machine:
+
+```bash
+git clone https://github.com/your-username/repository-name.git
+```
+Replace your-username with your GitHub username and repository-name with the name of the repository.
+
+
+## Step 3: Create a New Branch
+
+Navigate into the cloned repository:
+
+```bash
+cd repository-name
+```
+
+Create and switch to a new branch for your changes:
+```bash
+git checkout -b feature-branch-name
+```
+
+Choose a descriptive name for your branch, such as fix-bug-123 or add-feature-xyz.
+
+## Step 4: Make Your Changes
+
+Make the necessary changes to the codebase. You can use any code editor of your choice.
+
+## Step 5: Commit Your Changes
+
+```bash
+git add .
+git commit -m "Brief description of your changes"
+```
+
+Write a clear and concise commit message that describes what you have done.
+
+## Step 6: Push Your Changes
+
+Push your changes to your forked repository:
+
+```bash
+git push origin feature-branch-name
+```
+
+## Step 7: Create a Pull Request
+
+1. Go to your forked repository on GitHub.
+2. You should see a banner suggesting to compare & pull request. Click on it. If not, navigate to the "Pull requests" tab and click "New pull request."
+3. Make sure the base repository is the original repository and the base branch is where you want to merge your changes (usually main or master).
+4. The compare branch should be the branch you pushed your changes to.
+5. Write a title and description for your pull request. Provide details on what changes you made and why.
+6. Click "Create pull request."
+
+## Step 8: Address Feedback
+
+Once your pull request is created, other contributors or maintainers may review it and leave feedback. Be prepared to make additional changes based on this feedback.
+
+**To make changes:**
+    1. Make the required changes on your local branch.
+    2. Commit and push the changes:
+        ```bash
+        git add .
+        git commit -m "Addressed feedback on XYZ"
+        git push origin feature-branch-name
+        ```
+The pull request will automatically update with your new commits.
+
+## Step 9: Merge the Pull Request
+
+Once your pull request has been approved, a maintainer will merge it into the base branch. In some projects, you may have permission to merge it yourself.
+
+## Step 10: Clean Up
+
+After your pull request has been merged, you can clean up your local repository by deleting the branch:
+
+```bash
+git checkout main
+git pull origin main
+git branch -d feature-branch-name
+```
+```javascript
+
+  useEffect(() => {
+        const fetchDocs = async () => {
+            try {
+                const response = await fetch('/posts/index.json');
+                if (!response.ok) {
+                    throw new Error('Network response was not ok');
+                }
+                const data = await response.json();
+                setDocs(data);
+            } catch (error) {
+                setError(error.message);
+            } finally {
+                setLoading(false);
+            }
+        };
+
+        fetchDocs();
+    }, []);
+
+```
+You may also delete the branch from your fork on GitHub.
+
+Congratulations! You've successfully created and merged a pull request. This process helps maintain code quality and encourages collaboration among developers.
+
+This tutorial covers the basics of creating a pull request and includes best practices to help beginners understand the process.
diff --git a/src/data/error.json b/src/data/error.json
@@ -12,7 +12,6 @@
       "description": "error: failed to push some refs to 'github.com:user/repo.git'",
       "solutions": "rm -rf .git<git init<git add .<git commit -m \"ges\"<git branch -M main<git remote add origin YOUR_GITHUB_REPO_LINK<git push -u origin main -f"
     },
-
     {
       "type": "merge",
       "title": "fatal: refusing to merge unrelated histories",
@@ -25,7 +24,7 @@
       "description": "Unable to add file. While adding file, it shows fatal: not a valid object name: 'master'.",
       "solutions": "git commit -m \"first commit\""
     },
-     {
+    {
       "type": "add",
       "title": "Another git process seems to be running in this repository",
       "description": "Another git process seems to be running in this repository, e.g. an editor opened by 'git commit'. Please make sure all processes are terminated then try again. If it still fails, a git process may have crashed in this repository earlier: remove the file manually to continue.",
@@ -43,13 +42,19 @@
       "description": "Can't switch/checkout to the BRANCH, bcz this branch is not exits man!",
       "solutions": "This branch is not there, you have to create this branch. < git branch BRANCHNAME -m"
     },
+    {
+      "type": "branch",
+      "title": "error: bad signature 0x00000000",
+      "description": "Can't switch/checkout to the BRANCH, fatal: index file corrupt!",
+      "solutions": "rm .git/index < git reset"
+    },
     {
       "type": "add",
       "title": "error: Your local changes to the following files would be overwritten by checkout: <file name>",
       "description": "Please commit your changes or stash them before you stwitch branches. Aborting",
       "solutions": "rm -f .git/index.lock"
     },
-     {
+    {
       "type": "commit",
       "title": "error: Your local changes to the following files would be overwritten by checkout: <file name>",
       "description": "Please commit your changes or stash them before you stwitch branches. Aborting",
@@ -61,7 +66,7 @@
       "description": "fatal: Could not read from remote repository. Please make sure you have the correct access rights and the repository exists.",
       "solutions": "git pull origin BRANCHNAME"
     },
-      {
+    {
       "type": "pull",
       "title": "fatal: refusing to merge unrelated histories",
       "description": "The refusing to merge unrelated histories error typically occurs when Git detects that the branches you are trying to merge have divergent commit histories and are essentially unrelated.",
@@ -98,17 +103,17 @@
       "solutions": "git pull"
     },
     {
-            "type": "branch",
-            "title": "Delete Local branch",
-            "description": "You can easily delete a local branch. If the branch has not been merged, use git branch -d <branchname> instead.",
-            "solutions": "git branch --delete [branchname]"
-        },
-        {
-            "type": "pull",
-            "title": "Pulling issue",
-            "description": "error: bad signature 0x00000000, fatal: index file corrupt. NB: use git bash for this command. if you use cmd then use del instead of rm.",
-            "solutions": "rm -f .git/index<git reset"
-        },
+      "type": "branch",
+      "title": "Delete Local branch",
+      "description": "You can easily delete a local branch. If the branch has not been merged, use git branch -d <branchname> instead.",
+      "solutions": "git branch --delete [branchname]"
+    },
+    {
+      "type": "pull",
+      "title": "Pulling issue",
+      "description": "error: bad signature 0x00000000, fatal: index file corrupt. NB: use git bash for this command. if you use cmd then use del instead of rm.",
+      "solutions": "rm -f .git/index<git reset"
+    },
     {
       "type": "push",
       "title": "remote: Not Found",
@@ -308,16 +313,16 @@
       "solutions": "git status"
     },
     {
-      "type":"cmd",
-      "title":"error: RPC failed; curl transfer closed with outstanding read data remaining",
-      "description":"typically occurs when Git is unable to complete a network request, often due to a slow or unstable connection or Small HTTPS Buffer on Client machine",
-      "solutions":" increasing the Git buffer size and using a different network connection are two possible solutions that may help resolve the issue < git config http.postBuffer 524288000 < git config --global http.maxRequestBuffer 524288000 < git config --global core.compression 0"
+      "type": "cmd",
+      "title": "error: RPC failed; curl transfer closed with outstanding read data remaining",
+      "description": "typically occurs when Git is unable to complete a network request, often due to a slow or unstable connection or Small HTTPS Buffer on Client machine",
+      "solutions": " increasing the Git buffer size and using a different network connection are two possible solutions that may help resolve the issue < git config http.postBuffer 524288000 < git config --global http.maxRequestBuffer 524288000 < git config --global core.compression 0"
     },
-     {
+    {
       "type": "commit",
       "title": "Git nothing to commit",
       "description": "The Git command line informs us that our local repository contains one more commit than our remote repository.",
       "solutions": "git push"
     }
   ]
-}
+}
diff --git a/src/index.css b/src/index.css
diff --git a/src/pages/Doc/index.jsx b/src/pages/Doc/index.jsx
@@ -11,14 +11,16 @@ const DocList = () => {
     useEffect(() => {
         const fetchDocs = async () => {
             try {
-                const response = await fetch('/posts/index.json');
+                // const response = await fetch('/posts/index.json');
+                const response = await fetch('https://github-error-solve.vercel.app/posts/index.json');
                 if (!response.ok) {
-                    throw new Error('Network response was not ok');
+                    throw new Error(`HTTP error! status: ${response.status}`);
                 }
                 const data = await response.json();
                 setDocs(data);
             } catch (error) {
                 setError(error.message);
+                console.error("Error fetching JSON data:", error);
             } finally {
                 setLoading(false);
             }
@@ -27,6 +29,8 @@ const DocList = () => {
         fetchDocs();
     }, []);
 
+
+
     if (loading) return <div className="flex justify-center items-center h-screen"><Spin size="large" /></div>;
     if (error) return <Alert message="Error" description={error} type="error" />;
 
diff --git a/src/pages/Doc/single doc/index.jsx b/src/pages/Doc/single doc/index.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { useParams } from 'react-router-dom';
 import ReactMarkdown from 'react-markdown';
 import remarkGfm from 'remark-gfm';
@@ -13,6 +13,20 @@ const DocDetail = () => {
     const [loading, setLoading] = useState(true);
     const [error, setError] = useState(null);
     const [headings, setHeadings] = useState([]);
+    const tableRef = useRef(null);
+
+    useEffect(() => {
+        const handleScroll = () => {
+            if (tableRef.current) {
+                const rect = tableRef.current.getBoundingClientRect();
+                const isTableVisible = rect.top <= 0 && rect.bottom >= 100;
+                setIsSticky(isTableVisible);
+            }
+        };
+
+        window.addEventListener('scroll', handleScroll);
+        return () => window.removeEventListener('scroll', handleScroll);
+    }, []);
 
     useEffect(() => {
         const fetchContent = async () => {
@@ -33,7 +47,6 @@ const DocDetail = () => {
         fetchContent();
     }, [slug]);
 
-
     const extractHeadings = (markdown) => {
         const headings = [];
         const regex = /^#{1,6}\s+(.*)$/gm;
@@ -53,8 +66,9 @@ const DocDetail = () => {
     }, [content]);
 
     useEffect(() => {
-        if (window.location.hash) {
-            const id = window.location.hash.substring(1);
+        const hash = window.location.hash;
+        if (hash) {
+            const id = hash.substring(1);
             const element = document.getElementById(id);
             if (element) {
                 element.scrollIntoView({ behavior: 'smooth' });
@@ -67,17 +81,20 @@ const DocDetail = () => {
 
     return (
         <Layout>
-            <section className="container mx-auto p-4">
+            <section className="container mx-auto p-4 min-h-screen">
                 <h3 className="text-2xl md:text-3xl capitalize text-center my-10 mb-20 font-semibold">
                     {slug.replace(/-/g, ' ')}
                 </h3>
-                <div className="flex sticky top-20">
-                    <aside className="w-1/4 p-4">
+                <div className="flex">
+                    <aside ref={tableRef} className="sticky top-20 w-1/4 p-4 h-0">
                         <h2 className="text-xl font-bold mb-2">Table of Contents</h2>
                         <ul>
                             {headings.map((heading, index) => (
                                 <li key={index} className={`ml-${heading.level}`}>
-                                    <a href={`#${heading.title.replace(/\s+/g, '-').toLowerCase()}`}>
+                                    <a href={`#${heading.title.replace(/\s+/g, '-').toLowerCase()}`}
+
+                                        onClick={() => console.log(heading.title.replace(/\s+/g, '-').toLowerCase())}
+                                    >
                                         {heading.title}
                                     </a>
                                 </li>
@@ -106,13 +123,13 @@ const DocDetail = () => {
                                     );
                                 },
                                 h1({ node, children }) {
-                                    return <h1 className='text-xl font-normal mt-5' id={children[0].toLowerCase().replace(/\s+/g, '-')}> {children}</h1>;
+                                    return <h1 className='text-xl font-normal mt-10 mb-3' id={children.toLowerCase().replace(/\s+/g, '-')}> {children}</h1>;
                                 },
                                 h2({ node, children }) {
-                                    return <h2 className='text-xl font-normal mt-5' id={children[0].toLowerCase().replace(/\s+/g, '-')}>🌿 {children}</h2>;
+                                    return <h2 className='text-xl font-normal mt-10 mb-3' id={children.toLowerCase().replace(/\s+/g, '-')}>🌿 {children}</h2>;
                                 },
                                 h3({ node, children }) {
-                                    return <h3 className='text-xl font-normal mt-5' id={children[0].toLowerCase().replace(/\s+/g, '-')}>🌿 {children}</h3>;
+                                    return <h3 className='text-xl font-normal mt-10 mb-3' id={children.toLowerCase().replace(/\s+/g, '-')}>🌿 {children}</h3>;
                                 },
                                 // Handle other heading levels if needed
                             }}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +[
 +  {
 +    "title": "pull_request_tutorial_for_beginners"
 +  }
 +]