Skip to content

Commit 1b29a79

Browse files
committed
new error added
2 parents 45728c5 + ab6ff73 commit 1b29a79

3 files changed

Lines changed: 25 additions & 3 deletions

File tree

src/components/Header/Header.jsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@ import { Link } from "react-router-dom";
33

44
function Header({ notice }) {
55
return (
6+
<<<<<<< HEAD
67
<header className="p-4 bg-dark-secondary">
8+
=======
9+
<header className="p-4 bg-dark-secondary sticky top-0 z-50">
10+
>>>>>>> ab6ff739206088a7a085920c9ef786c354271d4d
711
<div className="w-full md:w-5/6 mx-auto flex flex-col md:flex-row justify-between items-center">
812
{/* <h1 className="text-xl font-bold">
913
GITHUB <span className="text-primary line-through">ERROR</span> SOLVE

src/components/Layout/Layout.jsx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,13 @@ const Layout = ({children}) => {
1212
<Header
1313
notice={"Under Construction"}
1414
/>
15+
<<<<<<< HEAD
1516
{children}
17+
=======
18+
<div className='relative'>
19+
{children}
20+
</div>
21+
>>>>>>> ab6ff739206088a7a085920c9ef786c354271d4d
1622
</>
1723
);
1824
};

src/data/error.json

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,25 @@
7070
"type": "pull",
7171
"title": "fatal: refusing to merge unrelated histories",
7272
"description": "fatal: repository 'https://github.com/user/repo.git/' not found",
73-
"solutions": "Your repository link is not valid. Try to re-create the repository and copy the new link.<git remote set-url origin YOUR_GITHUB_REPO_LINK"
73+
"solutions": "git pull origin main --allow-unrelated-histories"
7474
},
7575
{
7676
"type": "push",
7777
"title": "fatal: unable to access 'https://github.com/user/repo.git/': Could not...",
7878
"description": "fatal: repository 'https://github.com/user/repo.git/' not found",
7979
"solutions": "git config --global --unset http.proxy<git config --global user.name \"user name\"<git config --global user.email \"user email\""
80-
}
81-
]
80+
},
81+
{
82+
"type": "commit",
83+
"title": "Please enter the commit message for your changes",
84+
"description": "This error occurs when you attempt to commit changes to a Git repository without specifying a commit message, keep in mind it is also a good practice to include a more detailed explanation of the changes made in the commit message",
85+
"solutions": "git commit -m '<commit message>' "
86+
},
87+
{
88+
"type": "commit",
89+
"title": "fatal: Not a git repository (or any of the parent directories): .git",
90+
"description": "This error occurs when you attempt to commit without initiating a git repository, before initiating always make sure either you are in root directory or correct directory where you want to initiate git ",
91+
"solutions": "git init"
92+
}
93+
]
8294
}

0 commit comments

Comments
 (0)