Re: CONFLICT using git-pull

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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 thing I'd ask you to try is to check out _only_ the DCCP tree:

 1. use your normal tree
 2. create a subtree dccp:

	git branch -b dccp master

 3. now pull the `dccp' subtree into your tree (as Ian also recommended)

	 git-pull git://eden-feed.erg.abdn.ac.uk/dccp_exp dccp

If this still fails then there is a difference between your tree and the netdev-2.6 one
which needs to be resolved.

For such cases, I put up extracts from the DCCP patches online at 

	http://www.erg.abdn.ac.uk/users/gerrit/dccp/testing_dccp/test-tree/

HTH
Gerrit
-
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

[Index of Archives]     [Linux Kernel]     [IETF DCCP]     [Linux Networking]     [Git]     [Security]     [Linux Assembly]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux