Doing a git stash doesn't remove changes in git local -


this question has answer here:

when git status, see files having local changes (seems indentation changes).

and when git stash, doesn't remove files queue. blocks auto pull script fetching remote git. 

$ git stash saved working directory , index state wip on develop: 05c60a5 merge remote-tracking branch 'origin/develop' develop head @ 05c60a5 merge remote-tracking branch 'origin/develop' develop  $ git stash on branch develop  branch , 'origin/develop' have diverged , have 23 , 127 different commit(s) each, respectively.  changed not updated: (use "git add <file>..." update committed) (use "git checkout -- <file>..." discard changes in working directory)       modified:   config/buznames/businessname_map.     modified:   public/css/_lib/dropdown.less     modified:   public/css/_lib/securebadge.less

git stash remove uncommitted changes not local (unpushed) commits.

i believe local branch has diverged , you're having merge conflicts when you're trying pull. have resolve these conflicts before being able continue pull request.

if you're trying remove all local commits in develop branch respect remote branch can like:

$ git checkout develop $ git fetch origin develop # reset develop branch origin/develop $ git reset --hard origin/develop

note: delete/discard local commits. not able restore them


-

Comments

Post a Comment