[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Git help

From: Johannes Schindelin
Subject: Re: Git help
Date: Fri, 21 Sep 2007 14:18:22 +0100 (BST)


On Fri, 21 Sep 2007, Valentin Villenave wrote:

> 2007/9/21, Rune Zedeler <address@hidden>:
> > Sorry for the noise.
> I get this error message when I try to get your branch:
> %%%
> Trying really trivial in-index merge...
> VERSION: needs merge
> fatal: you need to resolve your current index first

This means that you have local changes.  Try "git status" and/or "git 
diff" to find out which changes those are.

As a rule of thumb, you should not pull if you have uncommitted changes.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]