8 comments
Comment actions Permalink

How do you know which commits are pushed? Do you see them (commits from other users) in the Push Dialog?

Please try the following:
1. Execute git fetch origin.
2. Execute git log ..origin/trunk to see which commits are waiting to be merged to your local branch.
3. Execute git merge origin/trunk to merge them (fetch + merge is equal to pull).
4. Execute git log origin/trunk.. to see which commits are going to be pushed. There should be only your unpushed commits (if any).

0
Comment actions Permalink

Hm, yep, that did the trick, there were several incoming commits from fetch and after successful merge there is no sign of them at the push stage.
But why such a difference? Isn't pull just the same fetch + merge?

0
Comment actions Permalink

pull is definitely the same as fetch + merge.
Can you try the same, but instead of steps 1, 2, 3 execute git pull origin trunk ? Then execute step 4 to see if there are commits to be pushed.

(I trying to investigate this starting from the command line to localize the problem: is it some configuration or misunderstanding, or it is a bug of the IDE)

0
Comment actions Permalink

I did what you've asked: there was incoming commit and it was on the list of "git log origin/trunk.." command, ready for push.
I checked the remote branch - there is no sign of that commit in the history. So I guess this is definetely not an IDE bug, but I still can't understand the problem if there is any =)

0
Comment actions Permalink

So, you don't see any other commits (from other developers) in the git log origin/trunk.. output, there is only your commit, right?
What about PhpStorm then? Which commits do you see in the Push Dialog?

Btw, you didn't answer to the following:

How do you know which commits are pushed? Do you see them (commits from other users) in the Push Dialog?

0
Comment actions Permalink

So, you don't see any other commits (from other developers) in the git log origin/trunk.. output, there is only your commit, right?

What about PhpStorm then? Which commits do you see in the Push Dialog?

How do you know which commits are pushed? Do you see them (commits from other users) in the Push Dialog?


Yep, I definetely see other developers commit in push dialog
0
Comment actions Permalink

So let me summarize: just before push you see commits from other developers in the PhpStorm's Push Dialog, but at the same time 'git log origin/trunk..' doesn't show you these commits, right?
If that is true, please attach the log here (Help -> Reveal Log in Explorer/Finder)

0
Comment actions Permalink

Kirill.Likhodedov@jetbrains.com wrote:

So let me summarize: just before push you see commits from other developers in the PhpStorm's Push Dialog, but at the same time 'git log origin/trunk..' doesn't show you these commits, right?
If that is true, please attach the log here (Help -> Reveal Log in Explorer/Finder)

'git log' also contains these commits, so I guess there is no problem in PhpStorm, because commits in the push dialog of IDE and in the git log output is the same.
I just don't get how come that pulled commits must be pushed once again. I will try my luck with git community from now on.
Thanks a lot for your help!

0

Please sign in to leave a comment.