☰
✕
✕
0

git pull command not working

when i run git pull command onto my git server i am getting this error

git pull origin master

From ssh://192.168.7.235:4512/test/project
 * branch            master     ->  FETCH_HEAD
Updating 1ff014f..d219b30
error: Your local changes to the following files would be overwritten by merge:
    public/assets/css/app.css
    public/assets/js/app.js
Please commit your changes or stash them before you merge.
Git gitlab
Add a comment
yousuf
asked Dec 28 2017

Answer

0

It's seems like merge issue on your gitlab server, so you can run below command to clear this issue

git stash
Add a comment
parthiban
asked Dec 28 2017
edited Oct 05 2018
Post your Answer