Re: git pull has conflicts
Amon Ott <[email protected]> Mon, 11 Feb 2013 11:14:11 +0100
| Newsgroups | gmane.linux.rsbac |
|---|---|
| Message-ID | <[email protected]> |
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. -- http://www.rsbac.org - GnuPG: 2048g/5DEAAA30 2002-10-22