{"thread":{"id":"8164","subject":"newby question about merge.","startedAt":"2007-05-15T09:38:20Z","lastAt":"2007-05-16T22:39:08Z","messageCount":11,"participants":["picca","Alex Riesen","Jakub Narebski","Junio C Hamano","Johannes Schindelin","Christian MICHON"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"42207","messageId":"20070515113820.2621c8d5@localhost.localdomain","threadId":"8164","inReplyTo":null,"subject":"newby question about merge.","fromName":"picca","fromEmail":"picca@synchrotron-soleil.fr","sentAt":"2007-05-15T09:38:20Z","receivedAt":"2007-05-15T09:38:20Z","isPatch":false,"sender":{"key":"picca@synchrotron-soleil.fr","avatar":null},"body":"Hello I am using git to deal with debian packages.\nSo i have two Branches the \"upstream\" one with the different version of\nthe programm I am packaging.\n\nexemple with two tags\n\nscigraphica/2.1.0\nscigraphica/0.8.0\n\nI have another branch the master one which is the upstream + the debian\ndirectory.\n\nSo I do a merge like this\n\"git merge upstream .\" when I am on the master branch to work on the new\npackage.\n\nEverything is fine until git merge the configure scripts. (autotools)\nthere is conflict with the configure file of the 0.8.0 version during\nthe last merge.\n\nMy question is how can I keep the upstream version of the configure\nfile instread of the one in the working directory.\n\nI read about the stage(1:2:3) but I do not know how if it is related to\nmy problem.\n\nThanks in advance.\n\nFrédéric\n"},{"id":"42210","messageId":"20070515102513.GB2893@steel.home","threadId":"8164","inReplyTo":"20070515113820.2621c8d5@localhost.localdomain","subject":"Re: newby question about merge.","fromName":"Alex Riesen","fromEmail":"raa.lkml@gmail.com","sentAt":"2007-05-15T10:25:13Z","receivedAt":"2007-05-15T10:25:13Z","isPatch":false,"sender":{"key":"raa.lkml@gmail.com","avatar":"https://avatars.githubusercontent.com/u/324101?v=4"},"body":"picca, Tue, May 15, 2007 11:38:20 +0200:\n> So I do a merge like this\n> \"git merge upstream .\" when I am on the master branch to work on the new\n> package.\n\nloose the dot. git-merge syntax is \"git merge branch1 [branch2...]\"\n"},{"id":"42211","messageId":"f2c23k$dm0$1@sea.gmane.org","threadId":"8164","inReplyTo":"20070515113820.2621c8d5@localhost.localdomain","subject":"Re: newby question about merge.","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2007-05-15T10:34:55Z","receivedAt":"2007-05-15T10:34:55Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"[Cc: picca , git@vger.kernel.org]\n\npicca wrote:\n\n> My question is how can I keep the upstream version of the configure\n> file instread of the one in the working directory.\n> \n> I read about the stage(1:2:3) but I do not know how if it is related to\n> my problem.\n\nYou can just do \"git cat-file -p :2:filename > filename\", then\n\"git add filename\" (or \"git update-index filename\") to resolve conflict.\n\nCheck first if :2: is correct file (and not for example :3:).\n-- \nJakub Narebski\nWarsaw, Poland\nShadeHawk on #git\n"},{"id":"42213","messageId":"20070515133720.20d76042@localhost.localdomain","threadId":"8164","inReplyTo":"f2c23k$dm0$1@sea.gmane.org","subject":"Re: newby question about merge.","fromName":"picca","fromEmail":"picca@synchrotron-soleil.fr","sentAt":"2007-05-15T11:37:20Z","receivedAt":"2007-05-15T11:37:20Z","isPatch":false,"sender":{"key":"picca@synchrotron-soleil.fr","avatar":null},"body":"On Tue, 15 May 2007 12:34:55 +0200\nJakub Narebski wrote:\n\n> [Cc: picca , git@vger.kernel.org]\n> \n> picca wrote:\n> \n> > My question is how can I keep the upstream version of the configure\n> > file instread of the one in the working directory.\n> > \n> > I read about the stage(1:2:3) but I do not know how if it is\n> > related to my problem.\n> \n> You can just do \"git cat-file -p :2:filename > filename\", then\n> \"git add filename\" (or \"git update-index filename\") to resolve\n> conflict.\n> \n> Check first if :2: is correct file (and not for example :3:).\n\nIn fact the right file was the :3: one.\n\nThank you very much.\n\nIs it possible to add this git cat-file -p :2:filename > filename in\nthe man page of git-merge in the resolve conflict part ?\n\nOr a link to the documentation speaking of this stage part.\n\nThanks\n\nFrédéric\n"},{"id":"42252","messageId":"7vabw5iws8.fsf@assigned-by-dhcp.cox.net","threadId":"8164","inReplyTo":"20070515133720.20d76042@localhost.localdomain","subject":"Re: newby question about merge.","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2007-05-15T21:47:51Z","receivedAt":"2007-05-15T21:47:51Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"picca writes:\n\n> Is it possible to add this git cat-file -p :2:filename > filename in\n> the man page of git-merge in the resolve conflict part ?\n>\n> Or a link to the documentation speaking of this stage part.\n\nSee:\n\nhttp://www.kernel.org/pub/software/scm/git/docs/user-manual.html#conflict-resolution\n\nAs this walk through section from the user manual's already\ntalks about it, I am not sure if we would want to duplicate its\nwording in git-merge manual page.\n\nRegardlessly, I think it is a good idea to refer to it in SEE\nALSO section, just in case the user hasn't read the user manual\nbefore reading the git-merge manpage.\n"},{"id":"42291","messageId":"20070516083335.106667c5@localhost.localdomain","threadId":"8164","inReplyTo":"7vabw5iws8.fsf@assigned-by-dhcp.cox.net","subject":"Re: newby question about merge.","fromName":"picca","fromEmail":"picca@synchrotron-soleil.fr","sentAt":"2007-05-16T06:33:35Z","receivedAt":"2007-05-16T06:33:35Z","isPatch":false,"sender":{"key":"picca@synchrotron-soleil.fr","avatar":null},"body":"On Tue, 15 May 2007 14:47:51 -0700\nJunio C Hamano wrote:\n\n> picca writes:\n> \n> > Is it possible to add this git cat-file -p :2:filename > filename in\n> > the man page of git-merge in the resolve conflict part ?\n> >\n> > Or a link to the documentation speaking of this stage part.\n> \n> See:\n> \n> http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#conflict-resolution\n> \n> As this walk through section from the user manual's already\n> talks about it, I am not sure if we would want to duplicate its\n> wording in git-merge manual page.\n\nI had already red this manual but did not catch up that the :2:configure\nwas the git path of the files I want to retreive. In fact I was missing\nthe git-cat-file part and the git path.\n\n\nregards, frederic\n"},{"id":"42311","messageId":"Pine.LNX.4.64.0705161241560.6410@racer.site","threadId":"8164","inReplyTo":"f2c23k$dm0$1@sea.gmane.org","subject":"Re: newby question about merge.","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-05-16T11:43:11Z","receivedAt":"2007-05-16T11:43:11Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Tue, 15 May 2007, Jakub Narebski wrote:\n\n> You can just do \"git cat-file -p :2:filename > filename\", then \"git add \n> filename\" (or \"git update-index filename\") to resolve conflict.\n\nDo we really want to advertise this obscure-looking plumbing? Wouldn't it \nbe better to teach people to use \"git show\" instead?\n\nI mean, people can get intimidated by that...\n\nCiao,\nDscho\n"},{"id":"42314","messageId":"46d6db660705160721u24e43f7bmb5171555158089fb@mail.gmail.com","threadId":"8164","inReplyTo":"Pine.LNX.4.64.0705161241560.6410@racer.site","subject":"Re: newby question about merge.","fromName":"Christian MICHON","fromEmail":"christian.michon@gmail.com","sentAt":"2007-05-16T14:21:01Z","receivedAt":"2007-05-16T14:21:01Z","isPatch":false,"sender":{"key":"christian.michon@gmail.com","avatar":"https://gravatar.com/avatar/8a7c327b21187fbcab5c27640a49450eec72e0355dc292501197f27a5a744ec4?d=mp&s=160"},"body":"On 5/16/07, Johannes Schindelin wrote:\n> > You can just do \"git cat-file -p :2:filename > filename\", then \"git add\n> > filename\" (or \"git update-index filename\") to resolve conflict.\n>\n> Do we really want to advertise this obscure-looking plumbing? Wouldn't it\n> be better to teach people to use \"git show\" instead?\n>\n> I mean, people can get intimidated by that...\n>\n> Ciao,\n> Dscho\n>\n\nI could be wrong, but git-show works in this way only after version 1.5, right ?\n\nAs far as I can tell, using git-1.4.4.4 or ealier, you would still need\ngit-cat-file -p... to fix this merge conflict.\n\n-- \nChristian\n"},{"id":"42315","messageId":"Pine.LNX.4.64.0705161542540.6410@racer.site","threadId":"8164","inReplyTo":"46d6db660705160721u24e43f7bmb5171555158089fb@mail.gmail.com","subject":"Re: newby question about merge.","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-05-16T14:45:12Z","receivedAt":"2007-05-16T14:45:12Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\n[please, Christian, do not cut the Cc: list. In particular, do _not_ cut \nthe person you are _responding_ to from the Cc: list]\n\nOn Wed, 16 May 2007, Christian MICHON wrote:\n\n> On 5/16/07, Johannes Schindelin wrote:\n> > > You can just do \"git cat-file -p :2:filename > filename\", then \"git \n> > > add filename\" (or \"git update-index filename\") to resolve conflict.\n> > \n> > Do we really want to advertise this obscure-looking plumbing? Wouldn't \n> > it be better to teach people to use \"git show\" instead?\n> > \n> > I mean, people can get intimidated by that...\n> \n> I could be wrong, but git-show works in this way only after version 1.5, \n> right ?\n\nYes. So what?\n\n> As far as I can tell, using git-1.4.4.4 or ealier, you would still need \n> git-cat-file -p... to fix this merge conflict.\n\nIf you are using pre-1.5 Git, you should really, really upgrade.\n\nIf you do not want to do that, then _at least_ you should not confuse \nnewbies, who _should_ use Git 1.5+.\n\nAnd most importantly: if you suggest a change in the man pages, it should \nreflect the new Git versions, _not_ the old ones.\n\nOkay?\n\nCiao,\nDscho\n"},{"id":"42327","messageId":"46d6db660705161235k130fabc2i6acb45d71b85891e@mail.gmail.com","threadId":"8164","inReplyTo":"Pine.LNX.4.64.0705161542540.6410@racer.site","subject":"Re: newby question about merge.","fromName":"Christian MICHON","fromEmail":"christian.michon@gmail.com","sentAt":"2007-05-16T19:35:46Z","receivedAt":"2007-05-16T19:35:46Z","isPatch":false,"sender":{"key":"christian.michon@gmail.com","avatar":"https://gravatar.com/avatar/8a7c327b21187fbcab5c27640a49450eec72e0355dc292501197f27a5a744ec4?d=mp&s=160"},"body":"On 5/16/07, Johannes Schindelin wrote:\n> [please, Christian, do not cut the Cc: list. In particular, do _not_ cut\n> the person you are _responding_ to from the Cc: list]\n\n[ oops. I thought some of us sometimes receive doublets of emails,\nbeing in reply_to and cc of git@vger.kernel.org. point *taken* ]\n\n> > I could be wrong, but git-show works in this way only after version 1.5,\n> > right ?\n>\n> Yes. So what?\n\nI also sometimes use old git versions (I still consider 1.4.4.4 as a reference).\n\nI know the API changes frequently. But engineers don't like too many changes\nusually, and like to carry a portable/stable way. \"git cat-file\" at\nleast behaves\nas it was in 1.4.x :)\n\n> > As far as I can tell, using git-1.4.4.4 or ealier, you would still need\n> > git-cat-file -p... to fix this merge conflict.\n>\n> If you are using pre-1.5 Git, you should really, really upgrade.\n\nWhile in principle I'd agree, in practice I do not. Git API changes\nincreased learning curve for people who actually started with git a\nyear ago.\n\nNote this is a git user feedback, not a git developer feedback.\n\n>\n> If you do not want to do that, then _at least_ you should not confuse\n> newbies, who _should_ use Git 1.5+.\n\nhey, I'm not a newbie anymore! :)\n\nit's just that today, on a machine I only had git-1.4.4.4 to play with,\nI had to do a merge of 2 private branches ( aufs and squashfs) on\nlinux-2.6.21... I had 3 smalls conflicts to fix and I saw this thread...\nand decided to stick with git-cat-file on this fix.\n\n> And most importantly: if you suggest a change in the man pages, it should\n> reflect the new Git versions, _not_ the old ones.\n\nnope, I would not dare to suggest. I'm not a git developer: just a git user :)\n\n> Okay?\n\nyep\n\n-- \nChristian\n"},{"id":"42340","messageId":"Pine.LNX.4.64.0705162325020.6410@racer.site","threadId":"8164","inReplyTo":"46d6db660705161235k130fabc2i6acb45d71b85891e@mail.gmail.com","subject":"Re: newby question about merge.","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2007-05-16T22:39:08Z","receivedAt":"2007-05-16T22:39:08Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Wed, 16 May 2007, Christian MICHON wrote:\n\n> On 5/16/07, Johannes Schindelin wrote:\n> > [please, Christian, do not cut the Cc: list. In particular, do _not_ \n> > cut the person you are _responding_ to from the Cc: list]\n> \n> [ oops. I thought some of us sometimes receive doublets of emails,\n> being in reply_to and cc of git@vger.kernel.org. point *taken* ]\n\nActually, I get doublets. Which is good, since I am more unlikely to just \ndelete _two_ copies of the same mail.\n\n> I know the API changes frequently. But engineers don't like too many \n> changes usually, and like to carry a portable/stable way. \"git cat-file\" \n> at least behaves as it was in 1.4.x :)\n\nThose changes were good changes. \"git-show\" is here to stay. \n\"git-cat-file\" only appeals to Unix zealots who even sleep in their \ncommand line.\n\n> > > As far as I can tell, using git-1.4.4.4 or ealier, you would still \n> > > need git-cat-file -p... to fix this merge conflict.\n> > \n> > If you are using pre-1.5 Git, you should really, really upgrade.\n> \n> While in principle I'd agree, in practice I do not. Git API changes \n> increased learning curve for people who actually started with git a year \n> ago.\n\nI think I can pretty much guarantee that git-cat-file will stay plumbing. \nAs much as it will keep its not-exactly-user-friendly command line \narguments.\n\nAnd I can pretty much guarantee that git-show will always be the good \nthing for an end user to call.\n\n> > And most importantly: if you suggest a change in the man pages, it \n> > should reflect the new Git versions, _not_ the old ones.\n> \n> nope, I would not dare to suggest. I'm not a git developer: just a git \n> user :)\n\nYou are right: for general help, this list is open for older versions of \nGit. What triggered my response, though, was the suggestion to put that \nparticular command line, which indeed scares people away from Git (I tried \nit on somebody), into a man page.\n\n\tgit-show :\n\nis so much nicer.\n\nCiao,\nDscho\n"}]}