[LLVMdev] git Status Update?
David A. Greene
dag at cray.com
Tue Sep 13 09:41:34 PDT 2011
Renato Golin <rengolin at systemcall.org> writes:
> On 13 September 2011 15:50, Matthieu Moy <Matthieu.Moy at grenoble-inp.fr> wrote:
>> I guess you have to rebase (pull --rebase or so) your branches. "git
>> rebase" is relatively smart, and will skip patches that you already have
>> in your local branch.
> "Since the upstream repository is in Subversion, you should use "git
> pull --rebase" instead of "git pull" to avoid generating a non-linear
> history in your clone."
Yeah, I do all that stuff. I still get false conflicts on things I sent
via dcommit. Apparently I am doing something wrong. :(
More information about the llvm-dev