Question

I wanted to do

git svn dcommit

but I am getting

Merge conflict during commit: File or directory 
'.gitignore' is out of date; try updating: resource
 out of date; try updating at /usr/lib/git-core/git-svn line 922

how to update from svn repo only the .gitignore?

Answer 1

Sounds like you have uncommitted local changes to .gitignore – you will need to get them out of the way before you can update from the svn remote using git svn rebase.

Use

git stash

to temporarily hide your local changes, then use git svn rebase to get the latest version from svn. Next you can restore your temporary changes using

git stash pop

Git will report any conflicts which you can fix locally or if you decide you don’t need your local changes anymore use:

git checkout -- .gitignore

to overwrite your local .gitignore file with the one fetched from the repository.