On Thu, Apr 05, 2007 at 03:55:18PM -0500, Bill Lear wrote: > No, just plain ol' git push. One possibility is that in mediating > between him and the list, there has been a loss of information. > Perhaps he omitted details in his account of how things progressed --- > who knows, perhaps he was on the wrong branch (though I doubt this, he > only works on the master branch, and the other branch in question was > someone else's entirely). No, I think you gave the correct information. See the other part of the thread between me and Junio. What's happening is that 'git-push' tries to push every ref that both you and the remote have. Because he's pushing into a non-bare repository, both sides have refs/remotes/origin/flexify. But they're not necessarily at the same point, since they're both fetched from whatever your origin is, thus the problem. In this case, his flexify tracking branch for origin is _behind_ the remote's, so the push doesn's work. > Regardless, does my assumption --- a 'git pull' should rectify > the 'you are not up to date' problem --- hold in general? Generally, yes. But the remotes/ hierarchy is not something you pull into. So in this case, it won't help. The real solution is that git-push should not be pushing remotes/ at all: it should be purely a local thing (the patch I posted elsewhere in the thread fixes this, but will not be the final behavior -- however, it's enough to fix this problem). As a temporary solution, fetching from origin should put him at the same place (or ahead of) the remote, which should allow the push to go through. -Peff - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html