From: Christian MICHON Date: Wed, 16 May 2007 19:35:46 GMT Subject: Re: newby question about merge. Message-ID: <46d6db660705161235k130fabc2i6acb45d71b85891e@mail.gmail.com> In-Reply-To: On 5/16/07, Johannes Schindelin wrote: > [please, Christian, do not cut the Cc: list. In particular, do _not_ cut > the person you are _responding_ to from the Cc: list] [ oops. I thought some of us sometimes receive doublets of emails, being in reply_to and cc of git@vger.kernel.org. point *taken* ] > > I could be wrong, but git-show works in this way only after version 1.5, > > right ? > > Yes. So what? I also sometimes use old git versions (I still consider 1.4.4.4 as a reference). I know the API changes frequently. But engineers don't like too many changes usually, and like to carry a portable/stable way. "git cat-file" at least behaves as it was in 1.4.x :) > > As far as I can tell, using git-1.4.4.4 or ealier, you would still need > > git-cat-file -p... to fix this merge conflict. > > If you are using pre-1.5 Git, you should really, really upgrade. While in principle I'd agree, in practice I do not. Git API changes increased learning curve for people who actually started with git a year ago. Note this is a git user feedback, not a git developer feedback. > > If you do not want to do that, then _at least_ you should not confuse > newbies, who _should_ use Git 1.5+. hey, I'm not a newbie anymore! :) it's just that today, on a machine I only had git-1.4.4.4 to play with, I had to do a merge of 2 private branches ( aufs and squashfs) on linux-2.6.21... I had 3 smalls conflicts to fix and I saw this thread... and decided to stick with git-cat-file on this fix. > And most importantly: if you suggest a change in the man pages, it should > reflect the new Git versions, _not_ the old ones. nope, I would not dare to suggest. I'm not a git developer: just a git user :) > Okay? yep -- Christian