I am facing a quite strange problem here as when I do a git pull, the files retrieved are seen by git as pushable changes
I think that began to happen after there was a conflict, which was then resolved
After that I kept on seeing commits waiting to be pushed in my pushable commits list
I use smartgit as GUI on windows 7, but the repo is on a unix machine
That seemed to only be a bug in the gui