linux - Cannot Pull branch -
i new git.
i pushed new changes online branch laptop. in server(linux centos) want pull changes.
i stashed files, when check 'git status'
, output be:
# on branch master # branch behind 'origin/master' 35 commits, , can fast-forwarded. # nothing commit (working directory clean)
when git pull origin master
, gives me:
from https:***************** * branch master -> fetch_head updating ddebf93..669051e error: untracked working tree file 'framework/.htaccess' overwritten merge. aborting
i don't know do.
the framework/.htaccess file on server not part of git repo.
the stash work files have been added repo.
add framework/.htaccess repo
git add framework/*
or ignore in .gitignore file
then commit , push/pull again
Comments
Post a Comment