diff --git a/src/data/error.json b/src/data/error.json index 6429433..21e8112 100644 --- 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", "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: ", "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 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 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