Unable to discard the local changes in Git

Question

I am using the Android Studio and Git is located with it. Path of Git in Android studio is as follows, C:\Users\abc\AppData\Local\GitHub\PortableGit_cf76fc1621ac41ad4fe86c420ab5ff403f1808b9\cmd\git.exe

there are some local file changes when I tried to discard the changes to this file it says unable to discard the file. Also clicking on file and say, open containing the folder it locates the file to My Documents which is not the path of the Git. It gives me an error and unable to discard the changes.

Git version is as follows: Proctional Fungramming (3.0.14.0) 8e2e75b

score 1 · Answer 1 · answered Mar 08 '16 at 05:54

1

you can use stash option to keep your local changes and pull from git

git stash
git pull
git stash pop

if you want to completely overwrite your local changes then reset should work

git reset --hard
git pull

answered Mar 08 '16 at 05:54

Nuthan Kumar

483
5
22

score 0 · Answer 2 · answered Mar 08 '16 at 05:50

0

git format-patch HEAD~X

will dump the desired X commits to your patch file

then use git apply to use them

answered Mar 08 '16 at 05:50

CodeWizard

128,036
21
144
167

@codeWizard- shall i write above code in Git shell ? – Swift Mar 08 '16 at 05:54
I am getting the error as fatal : ambiguous argument 'HEAD~X: unknown revision or path in the working tree. Use '--' to separate paths from revisions. – Swift Mar 08 '16 at 05:56
Yep. And replace the x with the number of commits you need. For example 5 – CodeWizard Mar 08 '16 at 06:14

Unable to discard the local changes in Git

2 Answers2