From: Linus Torvalds Date: Tue, 21 Feb 2006 18:55:15 GMT Subject: Re: merging problems with Linus' kernel tree. Message-ID: In-Reply-To: <20060221183306.GC22988@redhat.com> On Tue, 21 Feb 2006, Dave Jones wrote: > > Documentation/cpu-hotplug.txt: needs update > fatal: Entry 'Documentation/cpu-hotplug.txt' would be overwritten by merge. Cannot merge. This means that it's dirty in the index, not that you've committed any changes. Do a "git diff". (It may also be that the diff is empty, and only shows the filename. That means that you've changed the mtime - for example edited it, and then undone the edit - so that the file is dirty in the index, even if the _contents_ are the same. If so, do a "git-update-index --refresh" or similar, or just ask for "git status", which will do it for you as part of checking the status of all your files). Linus