Re: git pull has conflicts

I had to do: 
git commit -am "text"

I got the same result from describe on two different independ git
repositories.

Am Montag, den 11.02.2013, 11:14 +0100 schrieb Amon Ott:
> Am 10.02.2013 19:40, schrieb Jens Kasten:
> > Hi list,
> > 
> > I did a git pull and got this
> 
> Please call "git pull --rebase", because we rebase with every new kernel
> version.
> 
> Or, if your tree is an upstream tree, first pull latest version from
> there and then pull from RSBAC without --rebase.
> 
> Amon.