On Feb 9, 2008 12:50 AM, Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote: > So you're saying that the local sides' refs are ancestors of the remote > sides' refs? Exactly. And we could show a nicer message - rejected is too strong a word ;-) > The problem is that the local side cannot tell The local side has the remote refs if the client has fetched recently, so it might be able to tell in some cases. Not with authority (things may have changed on the server side...) but the client might be able to say something less alarming. > Another way to "solve" this issue, of course, is to use the remote layout. > I did the switchover myself some time ago; it was hard at first, since I > was so used to just check out the branches I just fetched. But in the > long run the distinction between local and tracking branches made life > much easier for me. What do you mean with "the remote layout"? I am using "remotes"+tracking branches as far as I can tell... cheers, m - 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
