From: Dmitry Potapov Date: Tue, 01 Dec 2009 05:47:34 GMT Subject: Re: "git merge" merges too much! Message-ID: <20091201054734.GB11235@dpotapov.dyndns.org> In-Reply-To: On Mon, Nov 30, 2009 at 07:24:14PM -0500, Greg A. Woods wrote: > > Things get even weirder if you happen to be playing with older branches > too -- most build tools don't have ability to follow files that go back > in time as they assume any product files newer than the sources are > already up-to-date, no matter how much older the sources might become on > a second build. No, files do not go back in time when you switch between branches. The timestamp on files is the time when they are written to your working tree (and it is so with other VCSes that I worked with, so I do not know where you get idea of file timestamps going back in time). Thus any building tool such as 'make' should work fine provided you have correct dependencies. I have switched between widely diversed branches, and I have never had any problem with that. Dmitry