Re: Really beginner on Version Control
- From
Dmitry Potapov <dpotapov@gmail.com>
- Date
- Sep 22, 2010, 22:15 UTC
- Message-ID
- <AANLkTin27ny4f2rPZSRWDVj3gOF1oH0t17WmsKH8TYXz@mail.gmail.com>
- In-Reply-To
- <1285155943433-5558696.post@n2.nabble.com>
On Wed, Sep 22, 2010 at 3:45 PM, FernandoBasso <FernandoBasso.br@gmail.com> wrote:
Show 9 quoted lines
> > 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