Category Archives: git

The following untracked working tree files would be overwritten by checkout: .gitignore

Problem :

git.exe checkout master —

error: The following untracked working tree files would be overwritten by checkout:
.gitignore

Please move or remove them before you switch branches.
Aborting

Solution :

try running below commands one by one on your repository

git fetch --all

git reset --hard origin/master
this will reset your .gitignore file or any other file which is conflicting.
hope this helps .

108 total views, no views today

Git Storing credentials failed No password provided in eclipse

Problem : 
Storing credentials failed No password provided
I am trying to clone repository from the github while pull it ask for password Then, and i entered wrong password ans store in secure wallet of eclipse Now when I tried to fetch or pull i got the error “not authorized”
However, when I used the advice and clicked “Change Credentials” or “remove credentials” I received the following error:
“Storing credentials failed No password provided”
Solution :
if you are using eclipse then you can solve this problem by following these steps.
Preferences > General > Security > Secure Storage > Contents
delete everything from the content tab
Now try again to pull from repository
enter your correct password and store in secure wallet storage of eclipse.
Hope this will work for you.

95 total views, no views today

You have not concluded your merge (MERGE_HEAD exists).

The problem is your previous pull failed to merge automatically and went to conflict state.
And the conflict wasn’t resolved properly before the next pull.

1) Undo the merge and pull again.

To undo a merge:

git merge –abort [Since git version 1.7.4]

git reset –merge [prior git versions]

2) pull again

3) Merge again

2) Resolve the conflict properly

3) Don’t forget to add and commit the merge.

4) git pull now everything should work fine.

This should fix your problem.

92 total views, no views today

fatal: refusing to merge unrelated histories

This problem generally occur when you try to checkout repo for the first time and try to commit some files in repo.

and during that following error message is shown from git:

Problem:

fatal: refusing to merge unrelated histories
Error redoing merge 1234deadbeef1234deadbeef

Solution:
1. open cmd.exe
2. open your repo path in cmd
3. Run command 

git pull origin master –allow-unrelated-histories

this should solve your problem.


93 total views, no views today