{"thread":{"id":"11664","subject":"errors in git pull","startedAt":"2008-01-18T08:49:16Z","lastAt":"2008-01-18T13:07:01Z","messageCount":2,"participants":["Ian Brown","Johannes Schindelin"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"65837","messageId":"d0383f90801180049p1599dd6fmfabcdcad7d9d3275@mail.gmail.com","threadId":"11664","inReplyTo":null,"subject":"errors in git pull","fromName":"Ian Brown","fromEmail":"ianbrn@gmail.com","sentAt":"2008-01-18T08:49:16Z","receivedAt":"2008-01-18T08:49:16Z","isPatch":false,"sender":{"key":"ianbrn@gmail.com","avatar":null},"body":"Hello,\n\n I am working agains a linux kernel net git repository.\n\nIt occurred to me more than once that when trying to\ngit-pull a repository I get the following errors; there errors appear\nalso after I am running\n\"git-reset --hard\".\nAny idea what can it be ?\nI must add that I did not made changes in my local copy of the repository.\n\nthe command I am running is:\n\ngit-pull git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25.git\n\n\nHere are the errors I get:\n\nmygateway:/work/src/2.6.25# gitNetPull.sh\n\nmygateway:/work/src/2.6.25# git diff\nmygateway:/work/src/2.6.25# gitNetPull.sh\nremote: Generating pack...\nremote: Done counting 8510 objects.\nResult has 7230 objects.\nremote: Deltifying 7230 objects...\nremote:  100% (7230/7230) done\nIndexing 7230 objects...\nremote: Total 7230 (delta 6181), reused 6367 (delta 5448)\n 100% (7230/7230) done\nResolving 6181 deltas...\n 100% (6181/6181) done\n909 objects were added to complete this thin pack.\nAuto-merged Documentation/feature-removal-schedule.txt\nCONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt\nAuto-merged MAINTAINERS\nAuto-merged drivers/connector/cn_queue.c\nAuto-merged drivers/connector/connector.c\nAuto-merged drivers/net/macvlan.c\nAuto-merged drivers/net/niu.c\nAuto-merged drivers/net/wireless/b43/xmit.c\nAuto-merged include/linux/inetdevice.h\nAuto-merged include/linux/netfilter.h\nCONFLICT (content): Merge conflict in include/linux/netfilter.h\nAuto-merged include/linux/netfilter/Kbuild\nAuto-merged include/linux/netfilter/xt_RATEEST.h\nCONFLICT (add/add): Merge conflict in include/linux/netfilter/xt_RATEEST.h\nAuto-merged include/linux/netfilter/xt_connlimit.h\nAuto-merged include/linux/netfilter/xt_rateest.h\nCONFLICT (add/add): Merge conflict in include/linux/netfilter/xt_rateest.h\nAuto-merged include/linux/tty.h\nAuto-merged include/linux/xfrm.h\nAuto-merged include/net/fib_rules.h\nCONFLICT (content): Merge conflict in include/net/fib_rules.h\nAuto-merged include/net/ip_fib.h\nAuto-merged include/net/neighbour.h\nAuto-merged include/net/netfilter/nf_conntrack_l3proto.h\nAuto-merged include/net/raw.h\nCONFLICT (content): Merge conflict in include/net/raw.h\nAuto-merged include/net/sch_generic.h\nAuto-merged include/net/sock.h\nAuto-merged include/net/tcp.h\nCONFLICT (content): Merge conflict in include/net/tcp.h\nAuto-merged include/net/xfrm.h\nAuto-merged net/appletalk/aarp.c\nAuto-merged net/atm/br2684.c\nCONFLICT (content): Merge conflict in net/atm/br2684.c\nAuto-merged net/atm/lec.c\nAuto-merged net/atm/proc.c\nAuto-merged net/ax25/af_ax25.c\nAuto-merged net/bridge/br_netfilter.c\nAuto-merged net/core/dev.c\nAuto-merged net/core/fib_rules.c\nCONFLICT (content): Merge conflict in net/core/fib_rules.c\nAuto-merged net/core/neighbour.c\nCONFLICT (content): Merge conflict in net/core/neighbour.c\nAuto-merged net/core/pktgen.c\nAuto-merged net/core/skbuff.c\nAuto-merged net/core/utils.c\nAuto-merged net/dccp/ccids/ccid3.c\nCONFLICT (content): Merge conflict in net/dccp/ccids/ccid3.c\nAuto-merged net/decnet/dn_route.c\nAuto-merged net/ipv4/arp.c\nCONFLICT (content): Merge conflict in net/ipv4/arp.c\nAuto-merged net/ipv4/devinet.c\nCONFLICT (content): Merge conflict in net/ipv4/devinet.c\nAuto-merged net/ipv4/fib_frontend.c\nCONFLICT (content): Merge conflict in net/ipv4/fib_frontend.c\nAuto-merged net/ipv4/fib_hash.c\nCONFLICT (content): Merge conflict in net/ipv4/fib_hash.c\nAuto-merged net/ipv4/fib_semantics.c\nAuto-merged net/ipv4/fib_trie.c\nCONFLICT (content): Merge conflict in net/ipv4/fib_trie.c\nAuto-merged net/ipv4/inet_lro.c\nAuto-merged net/ipv4/ipconfig.c\nAuto-merged net/ipv4/netfilter.c\nAuto-merged net/ipv4/netfilter/Kconfig\nCONFLICT (content): Merge conflict in net/ipv4/netfilter/Kconfig\nAuto-merged net/ipv4/netfilter/Makefile\nCONFLICT (content): Merge conflict in net/ipv4/netfilter/Makefile\nAuto-merged net/ipv4/netfilter/ip_tables.c\nCONFLICT (content): Merge conflict in net/ipv4/netfilter/ip_tables.c\nAuto-merged net/ipv4/netfilter/ipt_CLUSTERIP.c\nAuto-merged net/ipv4/netfilter/ipt_ECN.c\nAuto-merged net/ipv4/netfilter/ipt_LOG.c\nAuto-merged net/ipv4/netfilter/ipt_MASQUERADE.c\nAuto-merged net/ipv4/netfilter/ipt_NETMAP.c\nAuto-merged net/ipv4/netfilter/ipt_REDIRECT.c\nAuto-merged net/ipv4/netfilter/ipt_REJECT.c\nCONFLICT (content): Merge conflict in net/ipv4/netfilter/ipt_REJECT.c\nCONFLICT (delete/modify): net/ipv4/netfilter/ipt_TOS.c deleted in\n7651a1f7ebe567f9088283f6354a5634b5dccb8e and modified in HEAD. Version\nHEAD of net/ipv4/netfilter/ipt_TOS.c left in tree.\nAuto-merged net/ipv4/netfilter/ipt_TTL.c\nAuto-merged net/ipv4/netfilter/ipt_ULOG.c\nAuto-merged net/ipv4/netfilter/ipt_addrtype.c\nAuto-merged net/ipv4/netfilter/ipt_ah.c\nAuto-merged net/ipv4/netfilter/ipt_ecn.c\nCONFLICT (delete/modify): net/ipv4/netfilter/ipt_iprange.c deleted in\n7651a1f7ebe567f9088283f6354a5634b5dccb8e and modified in HEAD. Version\nHEAD of net/ipv4/netfilter/ipt_iprange.c left in tree.\nAuto-merged net/ipv4/netfilter/ipt_recent.c\nAuto-merged net/ipv4/netfilter/ipt_ttl.c\nAuto-merged net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c\nAuto-merged net/ipv4/netfilter/nf_conntrack_proto_icmp.c\nAuto-merged net/ipv4/raw.c\nCONFLICT (content): Merge conflict in net/ipv4/raw.c\nAuto-merged net/ipv4/route.c\nAuto-merged net/ipv4/tcp.c\nAuto-merged net/ipv4/tcp_cong.c\nAuto-merged net/ipv6/datagram.c\nAuto-merged net/ipv6/netfilter/Kconfig\nCONFLICT (content): Merge conflict in net/ipv6/netfilter/Kconfig\nAuto-merged net/ipv6/netfilter/ip6_tables.c\nCONFLICT (content): Merge conflict in net/ipv6/netfilter/ip6_tables.c\nAuto-merged net/ipv6/netfilter/ip6t_HL.c\nAuto-merged net/ipv6/netfilter/ip6t_LOG.c\nAuto-merged net/ipv6/netfilter/ip6t_REJECT.c\nAuto-merged net/ipv6/netfilter/ip6t_ah.c\nAuto-merged net/ipv6/netfilter/ip6t_eui64.c\nAuto-merged net/ipv6/netfilter/ip6t_frag.c\nAuto-merged net/ipv6/netfilter/ip6t_hbh.c\nAuto-merged net/ipv6/netfilter/ip6t_hl.c\nAuto-merged net/ipv6/netfilter/ip6t_ipv6header.c\nAuto-merged net/ipv6/netfilter/ip6t_mh.c\nAuto-merged net/ipv6/netfilter/ip6t_rt.c\nAuto-merged net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c\nAuto-merged net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c\nAuto-merged net/ipv6/raw.c\nCONFLICT (content): Merge conflict in net/ipv6/raw.c\nAuto-merged net/ipv6/route.c\nAuto-merged net/irda/af_irda.c\nAuto-merged net/mac80211/ieee80211_ioctl.c\nAuto-merged net/netfilter/Kconfig\nCONFLICT (content): Merge conflict in net/netfilter/Kconfig\nAuto-merged net/netfilter/Makefile\nAuto-merged net/netfilter/core.c\nAuto-merged net/netfilter/nf_conntrack_core.c\nAuto-merged net/netfilter/nf_conntrack_proto_sctp.c\nAuto-merged net/netfilter/nf_conntrack_proto_tcp.c\nAuto-merged net/netfilter/nf_conntrack_proto_udp.c\nAuto-merged net/netfilter/nf_conntrack_proto_udplite.c\nAuto-merged net/netfilter/nf_conntrack_standalone.c\nCONFLICT (delete/modify): net/netfilter/nf_sysctl.c deleted in\n7651a1f7ebe567f9088283f6354a5634b5dccb8e and modified in HEAD. Version\nHEAD of net/netfilter/nf_sysctl.c left in tree.\nAuto-merged net/netfilter/xt_CLASSIFY.c\nAuto-merged net/netfilter/xt_CONNMARK.c\nCONFLICT (content): Merge conflict in net/netfilter/xt_CONNMARK.c\nAuto-merged net/netfilter/xt_CONNSECMARK.c\nAuto-merged net/netfilter/xt_DSCP.c\nCONFLICT (content): Merge conflict in net/netfilter/xt_DSCP.c\nAuto-merged net/netfilter/xt_MARK.c\nCONFLICT (content): Merge conflict in net/netfilter/xt_MARK.c\nAuto-merged net/netfilter/xt_NFLOG.c\nAuto-merged net/netfilter/xt_NFQUEUE.c\nAuto-merged net/netfilter/xt_NOTRACK.c\nAuto-merged net/netfilter/xt_RATEEST.c\nCONFLICT (add/add): Merge conflict in net/netfilter/xt_RATEEST.c\nAuto-merged net/netfilter/xt_SECMARK.c\nAuto-merged net/netfilter/xt_TCPMSS.c\nAuto-merged net/netfilter/xt_TCPOPTSTRIP.c\nCONFLICT (add/add): Merge conflict in net/netfilter/xt_TCPOPTSTRIP.c\nAuto-merged net/netfilter/xt_TRACE.c\nAuto-merged net/netfilter/xt_comment.c\nAuto-merged net/netfilter/xt_connbytes.c\nAuto-merged net/netfilter/xt_connlimit.c\nAuto-merged net/netfilter/xt_connmark.c\nCONFLICT (content): Merge conflict in net/netfilter/xt_connmark.c\nAuto-merged net/netfilter/xt_conntrack.c\nCONFLICT (content): Merge conflict in net/netfilter/xt_conntrack.c\nAuto-merged net/netfilter/xt_dccp.c\nAuto-merged net/netfilter/xt_dscp.c\nCONFLICT (content): Merge conflict in net/netfilter/xt_dscp.c\nAuto-merged net/netfilter/xt_esp.c\nAuto-merged net/netfilter/xt_hashlimit.c\nAuto-merged net/netfilter/xt_helper.c\nAuto-merged net/netfilter/xt_length.c\nAuto-merged net/netfilter/xt_limit.c\nAuto-merged net/netfilter/xt_mac.c\nAuto-merged net/netfilter/xt_mark.c\nCONFLICT (content): Merge conflict in net/netfilter/xt_mark.c\nAuto-merged net/netfilter/xt_multiport.c\nAuto-merged net/netfilter/xt_owner.c\nCONFLICT (add/add): Merge conflict in net/netfilter/xt_owner.c\nAuto-merged net/netfilter/xt_physdev.c\nAuto-merged net/netfilter/xt_pkttype.c\nCONFLICT (content): Merge conflict in net/netfilter/xt_pkttype.c\nAuto-merged net/netfilter/xt_policy.c\nCONFLICT (content): Merge conflict in net/netfilter/xt_policy.c\nAuto-merged net/netfilter/xt_quota.c\nAuto-merged net/netfilter/xt_realm.c\nAuto-merged net/netfilter/xt_sctp.c\nAuto-merged net/netfilter/xt_statistic.c\nAuto-merged net/netfilter/xt_string.c\nAuto-merged net/netfilter/xt_tcpmss.c\nAuto-merged net/netfilter/xt_tcpudp.c\nAuto-merged net/netfilter/xt_time.c\nAuto-merged net/netfilter/xt_u32.c\nAuto-merged net/netlink/af_netlink.c\nCONFLICT (content): Merge conflict in net/netlink/af_netlink.c\nAuto-merged net/rose/af_rose.c\nAuto-merged net/sched/sch_htb.c\nAuto-merged net/sctp/sm_make_chunk.c\nAuto-merged net/sctp/sm_statefuns.c\nAuto-merged net/sctp/ulpevent.c\nAuto-merged net/x25/x25_forward.c\nAuto-merged net/xfrm/xfrm_policy.c\nAuto-merged net/xfrm/xfrm_state.c\nCONFLICT (content): Merge conflict in net/xfrm/xfrm_state.c\nAuto-merged net/xfrm/xfrm_user.c\nAutomatic merge failed; fix conflicts and then commit the result.\n\n\nregards,\nIan\n"},{"id":"65872","messageId":"alpine.LSU.1.00.0801181301590.5731@racer.site","threadId":"11664","inReplyTo":"d0383f90801180049p1599dd6fmfabcdcad7d9d3275@mail.gmail.com","subject":"Re: errors in git pull","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2008-01-18T13:07:01Z","receivedAt":"2008-01-18T13:07:01Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Fri, 18 Jan 2008, Ian Brown wrote:\n\n>  I am working agains a linux kernel net git repository.\n> \n> It occurred to me more than once that when trying to\n> git-pull a repository I get the following errors; there errors appear\n> also after I am running\n> \"git-reset --hard\".\n> Any idea what can it be ?\n> I must add that I did not made changes in my local copy of the repository.\n> \n> the command I am running is:\n> \n> git-pull git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25.git\n\nTo simplify, you can\n\n\tgit remote add origin git://<...>\n\nso you can call \"git pull\" and it will do the same.\n\n> CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt\n\nThese are merge conflicts.  Git thinks you have changed something.\n\nNow, this might be true, but it also might be the case that the tree you \nare pulling was rebased, i.e. rewound to a certain point in commit \nhistory, and committed to _differently_.\n\nAs a consequence, your state _before_ pulling looks as if _you_ changed \nsomething.  Since these changes are different than the now-current \nchanges, but touch the same code, they produce conflicts.\n\nYou might be lucky with \"git pull --rebase\" (needs a pretty recent git), \nbut if you are just tracking a certain tree and not committing yourself, I \nsuggest something like this:\n\ngit fetch origin && git reset --hard origin/master\n\nOf course, you _really_ have to make sure that you have no local changes \nof your own with this reset call, since it will just undo them (without \nsaving them first).\n\nIf you _do_ have local changes, you might want to do a \"git stash\" before \nthe reset, and a \"git stash apply\" after it (again, needs a pretty recent \ngit).\n\nHth,\nDscho\n"}]}