On 9/19/07, ツ Leandro Sales <leandroal@xxxxxxxxx> 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 experience the tree has been rebased so you'll have to reclone the tree and then reapply your patches. It's too hard to fix (or I'm too dumb!!) I keep at least two trees - one is Linus' pure one and one (or more) are my development trees. Then when git-pull fails you reclone based from Linus tree and it saves time and bandwidth. This is documented at: http://linux-net.osdl.org/index.php/DCCP_Testing#How_to_obtain Feel free to ask more questions. Ian -- Web1: http://wand.net.nz/~iam4/ Web2: http://www.jandi.co.nz Blog: http://iansblog.jandi.co.nz - To unsubscribe from this list: send the line "unsubscribe dccp" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
