Aarpardev first pull request (#171)

* Added error solution for devvsakib to review.

* OS Contribution from: aarpardev

src/data/error.json

@@ -48,6 +48,12 @@
       "description": "CONFLICT (add/add): Merge conflict in path/path/filename. Automatic merge failed; fix conflicts and then commit the result.",
       "solutions": "You have to manually solve the conflict and then: <git add .< git commit -m \"ges\""
     },
+    {
+      "type": "push",
+      "title": "Your branch is ahead of 'origin/main' by 1 commit",
+      "description": "You made a commit on your branch that needs to be merged to the main branch on Github.",
+      "solutions": "If you have the permission to update the repo: <git pull main <git checkout [your-branch] <git merge main <When finished the merge locally: <git push main"
+    },
     {
       "type": "push",
       "title": "Everything up-to-date",