From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Sat, 04 Apr 2015 10:29:48 +0300 Message-ID: <838ue8pd03.fsf@gnu.org> References: <83twx2xoc8.fsf@gnu.org> <87zj6tiko1.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331104935.GB2871@acm.fritz.box> <87y4mdi7tj.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331214347.GH2871@acm.fritz.box> <20150401103225.GA2633@acm.fritz.box> <87h9t080gx.fsf@javad.com> <83384jsx3o.fsf@gnu.org> <83pp7nrfdn.fsf@gnu.org> <83a8yqr226.fsf@gnu.org> <831tk2qvz5.fsf@gnu.org> <87384ii26v.fsf@uwakimon.sk.tsukuba.ac.jp> <83wq1tptvp.fsf@gnu.org> <87pp7lhc9h.fsf@uwakimon.sk.tsukuba.ac.jp> <83sichpqe9.fsf@gnu.org> <87ioddglu6.fsf@uwakimon.sk.tsukuba.ac.jp> <83a8yoq56m.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1428132618 7625 80.91.229.3 (4 Apr 2015 07:30:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 4 Apr 2015 07:30:18 +0000 (UTC) Cc: emacs-devel@gnu.org To: Sergey Organov Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 04 09:30:11 2015 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 1YeIWw-0008Hz-99 for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 09:30:10 +0200 Original-Received: from localhost ([::1]:36507 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeIWv-0005wH-GZ for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 03:30:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60463) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeIWh-0005w8-Nm for emacs-devel@gnu.org; Sat, 04 Apr 2015 03:29:57 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeIWe-00078u-E7 for emacs-devel@gnu.org; Sat, 04 Apr 2015 03:29:55 -0400 Original-Received: from mtaout23.012.net.il ([80.179.55.175]:53244) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeIWe-00076z-69 for emacs-devel@gnu.org; Sat, 04 Apr 2015 03:29:52 -0400 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0NM900I00TL7JC00@a-mtaout23.012.net.il> for emacs-devel@gnu.org; Sat, 04 Apr 2015 10:29:50 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NM900ITYU5QIM20@a-mtaout23.012.net.il>; Sat, 04 Apr 2015 10:29:50 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.175 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:184852 Archived-At: > From: Sergey Organov > Date: Sat, 04 Apr 2015 00:40:58 +0300 > > Eli Zaretskii writes: > > > It's for Alan to say if it's more helpful than saying that a merge is > > "just a commit". > > You are putting words into (my?) mouth. Nobody ever said that merge, the > operation, is just a commit, AFAIR. If you indeed meant me, that's what > I said: > > After true merge operation is finished, the only result of it is > single commit appended to your current branch. Git /is/ that > simple. All the possible complexity is in the stage of content > preparation for this commit. > > I fail to see how this could be taken as saying that merge is just a > commit. What I wanted to tell /you/, not /Alan/, is that there is no any > hidden meta-information or other mysteries involved. It was a long sub-thread, so I can understand how you could forget what started it. Let me remind you: You: > >> "Incorporates changes from the named commits (since the time their > >> histories diverged from the current branch) into the current branch." Me: > > Good luck understanding this when learning what merge does in Git! > > Starting from the "branch" thingy, which, as you will read everywhere > > is just a pointer to the HEAD commit. So what does it mean to > > "incorporate changes in the current branch", if the branch is just a > > pointer? You: > Yes, a pointer that moves to point to new commit automatically every > time you commit on the branch. Incorporating changes means the same > thing every time: commit. What's new or unusual about it? Which I interpreted as you saying that a merge "means" ("is") "just a commit", like every other commit. That simplification seemed unhelpful to me, because it ducks the real question of what happens _during_ the merge, thus failing to answer that question, and instead tells something like "what you are asking about has a very simple answer", with the sub-text of "it's clear to everyone else". Not helpful, since the original question is left unanswered, and the OP is now left to wonder what is it that he's missing that is clear to everyone else. IOW, you effectively answered a question of a newbie with a riddle he is challenged to solve in order to prove that he is as a smart as everybody else. Does this strike you as a good educational tactics in this case? The fact that you replied to my messages is irrelevant, because this is a public list with everyone reading it. Discussion of a question someone asked should certainly keep that someone in mind as being a participant, albeit passive, in the discussion. IOW, you are still answering his question, even if replying to someone else.