Minor mysteries in Version Control area
I'm trying to develop new habits of using PHPStorm for my git and github management. But sometimes I don't understand what it's telling me. Here are two things I currently see but don't understand - perhaps someone can enlighten me.
(1) In the Log tab, I see the following:
It looks like it's trying to indicate that origin (github) is one commit behind the local repo, but that's not true - I just checked github, and the newest commit is there. I did the push in PHPStorm Why does PHPStorm think origin is one step back?
(2) In the Local Changes tab, it continuously shows the text of an old commit (the fifth one back from current - you can see it in the log screenshot above):
Why is it doing that? A little history is that between that commit and the next one I did a "git push -f" from the SSH command line in my VM (the reason I needed to force push is because of something that happened many commits before that, so I don't think that's relevant). Did PHPStorm get confused because I did an action outside of its interface? I would have thought it would get its information from the repo, not store some separate log of its own. I would like that line to go away - it clutters up what should be a list of files with uncommitted changes.
请先登录再写评论。
> I did the push in PHPStorm Why does PHPStorm think origin is one step back?
Does it get better after you click VCS | Git | Fetch?
> Why is it doing that?
It's a changelist, you must have created it (maybe unintentionally). Currently, the default one is active, so you can simply delete it via the right click menu.
Thanks for the response. I had to close PHPStorm and work on some unrelated things, and when I opened it again, the three colored tags were all together (origin is now also at the latest commit). So I guess it didn't update itself after the last push or something, and re-synced upon opening.
And I don't know what a changelist is, but half the battle is knowing the terms, so I'll read up on it when I have a little time. Meanwhile, I deleted the one that was there.
Thanks again.