Re: git pull has conflicts

You should use rebase instead if you want to be sure you don't have any
issue with your commits.
Else, you might either have conflicts in the future, or bugs that the
mainline (in this case, rsbac.org's git repos) doesn't have.

(If that happens the easiest way to fix it is to clone fresh, or else
you could git rebase -i <your commit with "text"> and delete the
offending commit (or commits)


kang

On 02/11/13 09:29, Jens Kasten wrote:
> 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.
> 
> 
> _______________________________________________
> rsbac mailing list
> [email protected]
> http://www.rsbac.org/mailman/listinfo/rsbac
>