From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Caldwell Newsgroups: gmane.emacs.devel Subject: Re: git pull fails with merge conflicts. How can this possibly happen? Date: Fri, 14 Nov 2014 11:01:15 -0800 Message-ID: <5466517B.50705@porkrind.org> References: <20141114183737.GB3168@acm.acm> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pkcs7-signature"; micalg=sha1; boundary="------------ms090905090608000603070503" X-Trace: ger.gmane.org 1415991727 23895 80.91.229.3 (14 Nov 2014 19:02:07 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 14 Nov 2014 19:02:07 +0000 (UTC) To: Alan Mackenzie , emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 14 20:02:02 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XpM89-0004aH-U3 for ged-emacs-devel@m.gmane.org; Fri, 14 Nov 2014 20:02:02 +0100 Original-Received: from localhost ([::1]:37593 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpM89-0002ik-J3 for ged-emacs-devel@m.gmane.org; Fri, 14 Nov 2014 14:02:01 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42005) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpM81-0002go-Hv for emacs-devel@gnu.org; Fri, 14 Nov 2014 14:01:59 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XpM7v-00034T-Ky for emacs-devel@gnu.org; Fri, 14 Nov 2014 14:01:53 -0500 Original-Received: from sa38.galvanix.net ([98.126.48.38]:35271 helo=kill.porkrind.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XpM7v-00034B-9I for emacs-devel@gnu.org; Fri, 14 Nov 2014 14:01:47 -0500 Original-Received: from porkrind.org (cpe-76-170-36-134.socal.res.rr.com [76.170.36.134]) by kill.porkrind.org (Postfix) with ESMTPS id 38545622CE; Fri, 14 Nov 2014 11:01:23 -0800 (PST) Authentication-Results: kill.porkrind.org; dkim=pass reason="1536-bit key; unprotected key" header.d=porkrind.org header.i=@porkrind.org header.b=k6nT0Y1L; dkim-adsp=pass; dkim-atps=neutral Original-Received: from [10.0.0.10] (black.local [10.0.0.10]) (authenticated bits=0) by porkrind.org (8.14.4/8.14.4/Debian-8) with ESMTP id sAEJ1GOY014916 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT); Fri, 14 Nov 2014 11:01:16 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=porkrind.org; s=apoptygma; t=1415991676; bh=Qt2ydfzMCQsf51qwcH5BgLYsTvnSfndowPAUX5AO+lk=; h=Date:From:To:Subject:References:In-Reply-To:From; b=k6nT0Y1LK4sSw90hlGC4OUPNmsX0uK8XWFDj6tgagZx/ecuJUtyL/6jdH7rLoHm6t uTKbkSjGUW8jJFzZOmh/M9AhVmmKozFB4Dy4fSCDCDTxL7gO04b2qUFH80khzz6R2+ 0R+9NHPSfEYPeEpLCjNlt+aRcbY3Oel7CKGk/MpzMQCgxYNHYlOpESaGBdB2X95h8m Ue91c5JU6JvxT9k9Z9E4p24thaFE4ZIcLu406RWSmQWNr9sLbGjVd/vP5av User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:33.0) Gecko/20100101 Thunderbird/33.0 In-Reply-To: <20141114183737.GB3168@acm.acm> Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAQAAAD9CzEMAAAACXBIWXMAAAsTAAALEwEAmpwY AAAABGdBTUEAALGOfPtRkwAAACBjSFJNAAB6JQAAgIMAAPn/AACA6QAAdTAAAOpgAAA6mAAAF2+S X8VGAAABiklEQVR42rRYSZIDIQwzLv7/ZXLoEAzeBKG7ag4DRhZeBKQ0Qr5imLWCrKwn0HImc1Mx aAvmmc/cuAT7RMYws6v/gHeb0p4/y5792GJJlLZWOPgsdV5NaRes4Xe4632sLljD7wKv1Ta74H/h MxecN1Rc2TatYcP7zb+6WFfN/zMSHg1Ymuxjrzd+DuLw6Nlekggt1hvr7KK9tRIX85jjM6GTYhfv nzXH3jBdYc4koueBs66M+Xv9O9n5ML4urWssjGeMY3if3bzGSvk30BQ46OOaxJjLCpzPJAzXrOrD z5VFh58TIiwESIiCHNxxwPTy97qDei8YdpVdyYEv6EQcK8n+iTyE/Cn1eoe7HwN+F56oErVSGtJY Q1sR2ehaUHfjvJuv0tL7qAzEbBmfF2IHrVi8zp9N0pZtQZZHOXp/sLW4+hqKvm3iccaPwP3XgnKX n8/YtVeOsnenRG7VCBFlZ5fe3LOyANCVdGAIwDs7tTXGF4hIk15/iAfSgv2UkNFItSszOG3Ha7r0 GQBerhBkHOAzmQAAAABJRU5ErkJggg== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 98.126.48.38 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:177105 Archived-At: This is a cryptographically signed message in MIME format. --------------ms090905090608000603070503 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 11/14/14 10:37 AM, Alan Mackenzie wrote: > Hello, Emacs. >=20 > I've now advanced from my last puzzlement. It turns out that "git > clone" doesn't properly initialise the new repository. I had to do thi= s > manually with "git checkout emacs-24". Git checkout looks for a branch with the name "emacs-24", failing that it looks for one matching that in your remotes/* and copies that branch into "emacs-24". Thus remotes/origin/emacs-24 should be copied to emacs-24 (and you can check this in the .git/refs/* directory tree + =2Egit/packed-refs file=E2=80=94it's all text). > This "git pull" leaves a mass of merge conflicts. How can this be? > What does git pull actually do? The git pull man page says: > > "Incorporates changes from a remote repository into the current > branch. In its default mode, git pull is shorthand for git fetch > followed by git merge FETCH_HEAD." The man page is correct. > acm@acm ~/emacs/emacs.git/emacs-24 $ git branch -a > * emacs-24 > master > remotes/origin/HEAD -> origin/master > remotes/origin/emacs-24 > remotes/origin/master > acm@acm ~/emacs/emacs.git/emacs-24 $ git pull This is the "git fetch" part of "git pull": > remote: Counting objects: 32, done. > remote: Compressing objects: 100% (16/16), done. > remote: Total 32 (delta 26), reused 22 (delta 16) > Unpacking objects: 100% (32/32), done. > From /home/acm/emacs/emacs.git/master/. This is the "git merge" part: > + 911ad4a...6688117 emacs-24 -> origin/emacs-24 (forced update) The problem is the 911ad4a. If you look at that commit it is on the master branch. This implies that your local emacs-24 branch was not *really* the emacs-24 branch (Maybe you accidentally did "git checkout -b emacs-24"?). Git matched the "emacs-24" name to the "origin/emacs-24" and merged that in, but since your emacs-24 branch was was really just master you got a bunch of merge conflicts. That is my guess anyway, it's hard to tell without seeing your repo. If you "git reset" then "git log", which commit is first? If it's the 911ad4a then you aren't really on the emacs-24 branch. You can try poking around with gitk to see how the branches interact. I also quite like the "tig" tool (not part of git)=E2=80=94it's sort of a c= urses version of gitk. -David --------------ms090905090608000603070503 Content-Type: application/pkcs7-signature; name="smime.p7s" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="smime.p7s" Content-Description: S/MIME Cryptographic Signature MIAGCSqGSIb3DQEHAqCAMIACAQExCzAJBgUrDgMCGgUAMIAGCSqGSIb3DQEHAQAAoIIMYDCC BiQwggUMoAMCAQICAwkFtDANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UEBhMCSUwxFjAUBgNV BAoTDVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRl IFNpZ25pbmcxODA2BgNVBAMTL1N0YXJ0Q29tIENsYXNzIDEgUHJpbWFyeSBJbnRlcm1lZGlh dGUgQ2xpZW50IENBMB4XDTE0MDIxODEwNDcxNFoXDTE1MDIxOTEyNTQzNVowQDEbMBkGA1UE AwwSZGF2aWRAcG9ya3JpbmQub3JnMSEwHwYJKoZIhvcNAQkBFhJkYXZpZEBwb3JrcmluZC5v cmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkzgZ2USy/IIF69iMaP5dgxFrN n/ppK9+HRpKWsesQ71tTX9+CqObNny15tzbNgORggsM5vVB7EdyNOfwhu2ZUn48MVSKnKnIM LmQPJNlYLbSDM33Q+2amNgoWxyvv3lpP44hXDB0Tftwu+0GMagvxKN2kpgVj5PvCai0NAhtR LZO6pspCTocquiYRovB2gDXq5wUFAU02lvlIgNFSV5QhHMHrAssy2qwU3/aoA9ibRpvSTFes LtawCR1zdqOo/wUrYfXT/XdTWYHXpNSFPNSeoPNoU08/jbH/077fdOLXXDN/NMU5dbWXkveS 4qQHWI0Zmgxj2oYfIOrM9SpcbYNTAgMBAAGjggLYMIIC1DAJBgNVHRMEAjAAMAsGA1UdDwQE AwIEsDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwQwHQYDVR0OBBYEFOd0ivfp8yzr VKmctRAtCmk9fMCHMB8GA1UdIwQYMBaAFFNy7ZKc4NrLAVx8fpY1TvLUuFGCMB0GA1UdEQQW MBSBEmRhdmlkQHBvcmtyaW5kLm9yZzCCAUwGA1UdIASCAUMwggE/MIIBOwYLKwYBBAGBtTcB AgMwggEqMC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xpY3kucGRm MIH3BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAD AgEBGoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFjY29yZGluZyB0byB0aGUgQ2xh c3MgMSBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBvZiB0aGUgU3RhcnRDb20gQ0EgcG9saWN5 LCByZWxpYW5jZSBvbmx5IGZvciB0aGUgaW50ZW5kZWQgcHVycG9zZSBpbiBjb21wbGlhbmNl IG9mIHRoZSByZWx5aW5nIHBhcnR5IG9ibGlnYXRpb25zLjA2BgNVHR8ELzAtMCugKaAnhiVo dHRwOi8vY3JsLnN0YXJ0c3NsLmNvbS9jcnR1MS1jcmwuY3JsMIGOBggrBgEFBQcBAQSBgTB/ MDkGCCsGAQUFBzABhi1odHRwOi8vb2NzcC5zdGFydHNzbC5jb20vc3ViL2NsYXNzMS9jbGll bnQvY2EwQgYIKwYBBQUHMAKGNmh0dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRzL3N1Yi5j bGFzczEuY2xpZW50LmNhLmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3LnN0YXJ0c3NsLmNv bS8wDQYJKoZIhvcNAQELBQADggEBAEM1tq8Ddzl6dr2W4odR1XozlEXfny4oZiHJCeyVSTV3 l6JXYrphOEY2JYB/q7YdnjwKyg+p3TH7DL8uOLXu0nU/5rycJJYHQWp/Kn5ZDaZ8KM/Wdr98 h7UBFNHStZCduI6+u31SekHL35Y9nLkGegwhx5+tQhFzsPGmckK9+lmsjPMjS7TctG0sdSC3 uQVmH5BVBlkciQ9lpC8mS7Cdtvh1TVBTaxQZmou5kYXPWuNfjAP4jQk5k9iJejpB9ZU1tU1X k/W69tWKWoBUjBACmE5nyFiFPlw9I/fNoOGDJDaW6gJGehVfCyFe5wnqDj5Jl+SOHePLxGkx XifN281SdpMwggY0MIIEHKADAgECAgEeMA0GCSqGSIb3DQEBBQUAMH0xCzAJBgNVBAYTAklM MRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0 aWZpY2F0ZSBTaWduaW5nMSkwJwYDVQQDEyBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhv cml0eTAeFw0wNzEwMjQyMTAxNTVaFw0xNzEwMjQyMTAxNTVaMIGMMQswCQYDVQQGEwJJTDEW MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlm aWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVy bWVkaWF0ZSBDbGllbnQgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHCYPM zi3YGrEppC4Tq5a+ijKDjKaIQZZVR63UbxIP6uq/I0fhCu+cQhoUfE6ERKKnu8zPf1Jwuk0t svVCk6U9b+0UjM0dLep3ZdE1gblK/1FwYT5Pipsu2yOMluLqwvsuz9/9f1+1PKHG/FaR/wpb fuIqu54qzHDYeqiUfsYzoVflR80DAC7hmJ+SmZnNTWyUGHJbBpA8Q89lGxahNvuryGaC/o2/ ceD2uYDX9U8Eg5DpIpGQdcbQeGarV04WgAUjjXX5r/2dabmtxWMZwhZna//jdiSyrrSMTGKk DiXm6/3/4ebfeZuCYKzN2P8O2F/Xe2AC/Y7zeEsnR7FOp+uXAgMBAAGjggGtMIIBqTAPBgNV HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUU3Ltkpzg2ssBXHx+ljVO 8tS4UYIwHwYDVR0jBBgwFoAUTgvvGqRAW6UXaYcwyjRoQ9BBrvIwZgYIKwYBBQUHAQEEWjBY MCcGCCsGAQUFBzABhhtodHRwOi8vb2NzcC5zdGFydHNzbC5jb20vY2EwLQYIKwYBBQUHMAKG IWh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3Nmc2NhLmNydDBbBgNVHR8EVDBSMCegJaAjhiFo dHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9zZnNjYS5jcmwwJ6AloCOGIWh0dHA6Ly9jcmwuc3Rh cnRzc2wuY29tL3Nmc2NhLmNybDCBgAYDVR0gBHkwdzB1BgsrBgEEAYG1NwECATBmMC4GCCsG AQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xpY3kucGRmMDQGCCsGAQUFBwIB FihodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9pbnRlcm1lZGlhdGUucGRmMA0GCSqGSIb3DQEB BQUAA4ICAQAKgwh9eKssBly4Y4xerhy5I3dNoXHYfYa8PlVLL/qtXnkFgdtY1o95CfegFJTw qBBmf8pyTUnFsukDFUI22zF5bVHzuJ+GxhnSqN2sD1qetbYwBYK2iyYA5Pg7Er1A+hKMIzEz cduRkIMmCeUTyMyikfbUFvIBivtvkR8ZFAk22BZy+pJfAoedO61HTz4qSfQoCRcLN5A0t4Dk uVhTMXIzuQ8CnykhExD6x4e6ebIbrjZLb7L+ocR0y4YjCl/Pd4MXU91y0vTipgr/O75CDUHD RHCCKBVmz/Rzkc/b970MEeHt5LC3NiWTgBSvrLEuVzBKM586YoRD9Dy3OHQgWI270g+5MYA8 GfgI/EPT5G7xPbCDz+zjdH89PeR3U4So4lSXur6H6vp+m9TQXPF3a0LwZrp8MQ+Z77U1uL7T elWO5lApsbAonrqASfTpaprFVkL4nyGH+NHST2ZJPWIBk81i6Vw0ny0qZW2Niy/QvVNKbb43 A43ny076khXO7cNbBIRdJ/6qQNq9Bqb5C0Q5nEsFcj75oxQRqlKf6TcvGbjxkJh8BYtv9ePs XklAxtm8J7GCUBthHSQgepbkOexhJ0wP8imUkyiPHQ0GvEnd83129fZjoEhdGwXV27ioRKbj /cIq7JRXun0NbeY+UdMYu9jGfIpDLtUUGSgsg2zMGs5R4jGCA90wggPZAgEBMIGUMIGMMQsw CQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERp Z2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQ cmltYXJ5IEludGVybWVkaWF0ZSBDbGllbnQgQ0ECAwkFtDAJBgUrDgMCGgUAoIICHTAYBgkq hkiG9w0BCQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0xNDExMTQxOTAxMTVaMCMG CSqGSIb3DQEJBDEWBBS+b09yxdlmWXY3JsV4F7tULpbWuDBsBgkqhkiG9w0BCQ8xXzBdMAsG CWCGSAFlAwQBKjALBglghkgBZQMEAQIwCgYIKoZIhvcNAwcwDgYIKoZIhvcNAwICAgCAMA0G CCqGSIb3DQMCAgFAMAcGBSsOAwIHMA0GCCqGSIb3DQMCAgEoMIGlBgkrBgEEAYI3EAQxgZcw gZQwgYwxCzAJBgNVBAYTAklMMRYwFAYDVQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJT ZWN1cmUgRGlnaXRhbCBDZXJ0aWZpY2F0ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBD bGFzcyAxIFByaW1hcnkgSW50ZXJtZWRpYXRlIENsaWVudCBDQQIDCQW0MIGnBgsqhkiG9w0B CRACCzGBl6CBlDCBjDELMAkGA1UEBhMCSUwxFjAUBgNVBAoTDVN0YXJ0Q29tIEx0ZC4xKzAp BgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRlIFNpZ25pbmcxODA2BgNVBAMTL1N0 YXJ0Q29tIENsYXNzIDEgUHJpbWFyeSBJbnRlcm1lZGlhdGUgQ2xpZW50IENBAgMJBbQwDQYJ KoZIhvcNAQEBBQAEggEAICJWo6+oJM+y7C9O8SJMLLGWbXH2+5Y3P4XqUl7kxj22x6XBRDAE sv6XQ05GtbkpN7ZhihoH4GfMuSsI6SPPXHopS+ugLcNqVZfHqgg+40N42d4xGK8cXRcK5mAc L7yBeQlzpAIgtBsCaTO1z7hqwhcs/MQkYPjT598EYFHhx6bKg2sGfxNzkvBsv1FLfpxPY/c/ 0hdobq58WqxH33Y0lQgQIYhrGyZdVXoLRjbbFszUCIH0EtXjuDNYBkSk1YYP4G5TUkWe2VmN u50csecLWy/Tt6kwMHVW2spDk4U4VOStkN54TJbIereRSk3IX00Or38DWHPf7XaQMow4LxpD PgAAAAAAAA== --------------ms090905090608000603070503--