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: Wed, 01 Apr 2015 17:44:06 +0300 Message-ID: <83a8yrsybt.fsf@gnu.org> References: <871tk6538w.fsf@gnu.org> <838ueezgyk.fsf@gnu.org> <878ueejnjz.fsf@uwakimon.sk.tsukuba.ac.jp> <83twx2xoc8.fsf@gnu.org> <87619hke3u.fsf@uwakimon.sk.tsukuba.ac.jp> <551A3F17.6020903@math.ntnu.no> <20150331085055.GA2871@acm.fritz.box> <87zj6tiko1.fsf@uwakimon.sk.tsukuba.ac.jp> <20150331104935.GB2871@acm.fritz.box> <86ego5qoj1.fsf@example.com> <838uedtg47.fsf@gnu.org> <551AAEA1.30108@yandex.ru> <834mp1tf0j.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1427899502 25818 80.91.229.3 (1 Apr 2015 14:45:02 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 1 Apr 2015 14:45:02 +0000 (UTC) Cc: sva-news@mygooglest.com, emacs-devel@gnu.org, dgutov@yandex.ru To: rms@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 01 16:45:01 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 1YdJt5-0005dE-SW for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 16:45:00 +0200 Original-Received: from localhost ([::1]:53069 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdJt0-00087C-DL for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 10:44:54 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34991) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdJsm-00086q-6o for emacs-devel@gnu.org; Wed, 01 Apr 2015 10:44:41 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdJsi-00006x-6k for emacs-devel@gnu.org; Wed, 01 Apr 2015 10:44:40 -0400 Original-Received: from mtaout24.012.net.il ([80.179.55.180]:50612) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdJsh-00005Y-VT; Wed, 01 Apr 2015 10:44:36 -0400 Original-Received: from conversion-daemon.mtaout24.012.net.il by mtaout24.012.net.il (HyperSendmail v2007.08) id <0NM400100THPIM00@mtaout24.012.net.il>; Wed, 01 Apr 2015 17:35:53 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout24.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NM400NDHTVT4050@mtaout24.012.net.il>; Wed, 01 Apr 2015 17:35:53 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.180 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:184718 Archived-At: > Date: Wed, 01 Apr 2015 06:22:19 -0400 > From: Richard Stallman > CC: dgutov@yandex.ru, sva-news@mygooglest.com, emacs-devel@gnu.org > > With CVS, it would indicate the conflicts in those files, > and I only had to edit them to resolve the conflicts. > I do that by hand, since that way I know exactly what's going on > and I can do them in any order. You can do (almost) the same with Git, see my other message. > It seems that git handles this much worse. If you follow the procedure I suggested, I think you will find that Git handles this almost the same. That's why I suggested it, and not the alternatives.