From: FernandoBasso Date: Wed, 22 Sep 2010 11:45:43 GMT Subject: Re: Really beginner on Version Control Message-ID: <1285155943433-5558696.post@n2.nabble.com> In-Reply-To: <1AF8A1BC-1E52-4385-A0FC-16A04B4724FF@kellerfarm.com> 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 only if I changed the same line in both branches. If I change (same line) the master, commit. Change testing commit. Merge testing into master, they will not conflict because master haven't changed since testing changed. Master is "behind" testing. -- View this message in context: http://git.661346.n2.nabble.com/Really-beginner-on-Version-Control-tp5555023p5558696.html Sent from the git mailing list archive at Nabble.com.