On Jan 10, 2008 2:37 AM, Paolo Ciarrocchi <[EMAIL PROTECTED]> wrote: > On 1/10/08, Andi Kleen <[EMAIL PROTECTED]> wrote: > > > I'm already cloning the branches; the problem is not getting conflicts etc. > > when updating. > > Isn't git pull --force what you are looking for? > > Ciao, > -- > Paolo > http://paolo.ciarrocchi.googlepages.com/ >
Actually...no, it wouldn't help. Conflicts will coming up and only the solution for now is to use remote tracking as Harvey wrote in prev mail. (btw, git pull that would not conflict is when it called with '-s ours' but that is not good) - Cyrill - -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
