Git Troubleshooting Problems

1. How to fix Git Error ‘Your local changes to the following files will be overwritten by merge’-

Refrence1
Refrence2
Refrence3
Refrence4

1. commit your changes or stash them before you can merge-

Refrence1
Refrence2

1. Git push error![rejected] master -> master(non-fast-forward) error:failed to push some refs to…-
   
   Refrence1
   Refrence2

2. You have not concluded your merge (MERGE_HEAD exists)-
   

Refrence1
Refrence2

1. ambiguous argument ‘stash@‘: unknown revision or path not in the working tree.-

Refrence1
Refrence2

1. Git error: The following untracked working tree files would be overwritten by checkout-

Refrence1
Refrence2

1. Git Conflict Error: commit your changes or stash them before you can merge. Refrence1 Refrence2 Refrence3

8.git: "Updates were rejected because the tip of your current branch is behind.." but how to see differences?

Refrence1
Refrence2
Refrence3
Refrence4

8.

$ git push origin master
git@github.com: Permission denied (publickey).
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.

or

remote: Write access to repository not granted.
fatal: unable to access 'https://github.com/holidaylandmark/events.git/': The requested URL returned error: 403

Solution::

https://stackoverflow.com/questions/13509293/git-fatal-could-not-read-from-remote-repository

Solution

please look at .git/config file after git clone

First please look at .git/config file and see everything is in order. It had wrong set-url and origin values for me

did not get write access for git. Push only get Read access
by admin

Study Material

-Refrence1
-Refrence2
-Refrence3