0

whenever i do a git pull, it gives me an error along the lines of:

Please, commit your changes or stash them before you can merge.

I have tried git stash and the suggestions on this stackoverflow page and they didnt help either

Community
  • 1
  • 1
dadal
  • 3
  • 1

2 Answers2

1

the first suggestion "commit the changes" should work, perhaps you forgot to first run "git add -A" before doing "git commit -m 'commit message'"?

0

I would suggest checking out this resource Github Guide

git add . // Adds all your unstaged files
git commit -m "message in here" // Commits your files and adds a message
git push // Pushes your commit to the repo
scarsam
  • 325
  • 1
  • 12