On Wed, Sep 22, 2010 at 3:45 PM, FernandoBasso <FernandoBasso.br@xxxxxxxxx> wrote: > > On 09/22/2010 12:52 AM, Andrew Keller wrote: >> The only thing is, in your example, since master did not progress since >> testing diverged, >> git simply thinks of it as being "behind" testing... > > > You have used the word 'behind'. I think 'time' what is making me fail to > understand git merging. It depends on which branch I have changed last. Not really. Time is irrelevant, what matters is the common ancestor. Please, run gitk and take a look at the history graph. I think it will make some things obvious. They say one picture is worth a thousand words... Dmitry -- 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