git pull

Stream: new members

[Alex Zhang]

I saw this exclamation point after git pull. What does it mean here? I have resolved all the conflicts.
@Eric Wieser
image.png

[Alex Zhang]

Should I then do stage changes?
image.png

[Eric Wieser]

I think the exclamation mark is telling you that you have conflicts to resolve

[Eric Wieser]

I think if you save basic.lean the ! will go away?

[Alex Zhang]

I think so. I asked here as I think I should be careful before save or stage changes. Are they the same thing btw?

[Eric Wieser]

No; save writes your changes to your local filesystem. "stage changes" stages the changes from your local filesystem (i.e., you have to save first!) into git, so that they can be committed and pushed to github