Re: CONFLICT using git-pull

2007-10-18 Thread Gerrit Renker
It is not necessary to pull the git tree for the DCCP patches - they are all available as a single patch: http://www.erg.abdn.ac.uk/users/gerrit/dccp/testing_dccp/test-tree/ | FYI, I started to use git-gui and it seems to be very helpful, but I'm | still using quilt/gquilt to finish the patches

Re: CONFLICT using git-pull

2007-10-17 Thread Łeandro Sales
FYI, I started to use git-gui and it seems to be very helpful, but I'm still using quilt/gquilt to finish the patches series for ccid3/ccid4 integration. 2007/9/20, Gerrit Renker <[EMAIL PROTECTED]>: > | You said that will define a specific frequency > | (for instance, every week) that you will

Re: CONFLICT using git-pull

2007-09-19 Thread Gerrit Renker
| You said that will define a specific frequency | (for instance, every week) that you will do this. Did you already | define it? The repository is synced normally every working day from Mon .. Fri, based on the davem-2.6 tree - not the one used for the merge windows. - To unsubscribe from this

Re: CONFLICT using git-pull

2007-09-19 Thread ツ Leandro Sales
2007/9/19, Gerrit Renker <[EMAIL PROTECTED]>: > Leandro, - > > | But when I type git-pull > Warning: I don't know your configuration, but if you are checking out > everything > (which is fine), you will get the most recent netdev-tree. This is currently > tracking davem-2.6.git (not davem-2.6.24.

Re: CONFLICT using git-pull

2007-09-19 Thread ツ Leandro Sales
2007/9/19, Ian McDonald <[EMAIL PROTECTED]>: > On 9/19/07, ツ Leandro Sales <[EMAIL PROTECTED]> wrote: > > Hi, > >as for the implementation of CCID-4, I modified some files of the > > gerrit git during last week and weekend and now I but to make a fetch > > of te gerrit latest code. But when I t

Re: CONFLICT using git-pull

2007-09-19 Thread Gerrit Renker
Leandro, - | But when I type git-pull Warning: I don't know your configuration, but if you are checking out everything (which is fine), you will get the most recent netdev-tree. This is currently tracking davem-2.6.git (not davem-2.6.24.git, due to the troubles reported earlier). The first thin

Re: CONFLICT using git-pull

2007-09-18 Thread Ian McDonald
On 9/19/07, ツ Leandro Sales <[EMAIL PROTECTED]> wrote: > Hi, >as for the implementation of CCID-4, I modified some files of the > gerrit git during last week and weekend and now I but to make a fetch > of te gerrit latest code. But when I type git-pull I'm getting the > following: > >From past

CONFLICT using git-pull

2007-09-18 Thread ツ Leandro Sales
Hi, as for the implementation of CCID-4, I modified some files of the gerrit git during last week and weekend and now I but to make a fetch of te gerrit latest code. But when I type git-pull I'm getting the following: embedded-ephone1 dccp # git-pull 100% (22666/22666) done Removed arch/mips/m