Messages in this thread | | | Date | Fri, 11 Jan 2008 08:21:55 +0300 | From | "Cyrill Gorcunov" <> | Subject | Re: More breakage in native_rdtsc out of line in git-x86 |
| |
On Jan 10, 2008 2:37 AM, Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com> wrote: > On 1/10/08, Andi Kleen <andi@firstfloor.org> 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 -
| |