[Qgis-developer] Git errors on master branch fetch

[Werner Macho]

On 07/01/13 19:11, Larry Shaffer wrote:
> Hi,
>
> I develop on 3 different machines and since Jan. 4th (I think) I am
> getting the following git errors on all machines when doing a fetch
> for master:
>
> git fetch --prune qgisupstream
Hi Larry!
Not having such an error here - just tested with your git fetch command ..
I usually update my master only by
git pull --rebase upstream master

What happens when you try to clean out your own tree with

git reset --hard HEAD

at the branch where the problem occurs

kind regards
Werner