id	summary	reporter	owner	description	type	status	priority	milestone	component	version	severity	resolution	keywords	cc
39	git: pull sometimes refuses to merge	dmik		"I faced the following situation: I had a local copy of https://github.com/bitwiseworks/mozilla-os2.git with the master branch up to date, the `vendor-ear` branch at the previous merge (17.0.5 to 24.3.0) and the remote `vendor-esr` branch was already updated from 24.3.0 to 24.8.0 (on another machine). 

When I switch to that branch with `git checkout vendor-esr` locally, git correctly says that my local copy is 1 commit behind (this commit is the update to 24.8.0) and that it can be fast forwarded (i.e. have this commit applied w/on any possible conflicts).

However, when I do `git pull` (that first checks that remote changes are here with `fetch` and then calls `merge` to fast-forward), it fails with the following message:
{{{
error: The following untracked working tree files would be overwritten by merge:
}}} 

And then comes the list of the new files brought by the commit being fast forwarded. A subsequent `git status` call shows that there are no changes except these new files.

This surely didn't happen when I fast forwarded other branches with the new build of git 2.0.0 (i.e. the master branch of the mozilla repo or my test repo I created for playing with git). "	defect	closed	major	dev tools	git		low	fixed