Re: Really beginner on Version Control

From: Tor Arntsen <tor@spacetec.no>
Date: Sep 22, 2010, 12:50 UTC
Message-ID: <AANLkTinDevPY63WDfPTWVsR2xDNCZOU=aPwzu9r-Zpi+@mail.gmail.com>
In-Reply-To: <1285156189754-5558706.post@n2.nabble.com>

On Wed, Sep 22, 2010 at 13:49, FernandoBasso <FernandoBasso.br@gmail.com> wrote:

> I merge testing into master (without problems) and I change master and merge
> testing into master again (without any further modification). Now, git
> thinks that the changes I've just made in master are more important than the
> old changes in testing ?

Those old changes were already merged, so they won't get merged again. Git keeps track of which commits have been merged. If master originally consists of commits A, B, C, then you branch and make 'testing', then testing will start out with A, B, C. Then you add D to testing. Now master is A, B, C as before, testing is A, B, C, D. Then you merge. Now master will be A, B, C, D too. Then you add E to master: A, B, C, D, E. If you try to merge testing to master again Git sees that testing contains nothing that's not in master already.

(The letters stand for commits, i.e. changes you commited.)

-Tor