From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Andreas Schwab Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Wed, 01 Apr 2015 12:35:52 +0200 Message-ID: References: <86egoeusg2.fsf@example.com> <87384qzxqy.fsf@igel.home> <83bnjen71r.fsf@gnu.org> <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> <551A59F1.3060602@math.ntnu.no> <86384lciin.fsf@dod.no> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1427884580 16282 80.91.229.3 (1 Apr 2015 10:36:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 1 Apr 2015 10:36:20 +0000 (UTC) Cc: Steinar Bang , emacs-devel@gnu.org To: Richard Stallman Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 01 12:36:12 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 1YdG09-0004Nk-60 for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 12:36:01 +0200 Original-Received: from localhost ([::1]:50298 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdG08-0006Za-Iu for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 06:36:00 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55232) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdG05-0006Yo-JC for emacs-devel@gnu.org; Wed, 01 Apr 2015 06:35:58 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdG02-0004eU-DG for emacs-devel@gnu.org; Wed, 01 Apr 2015 06:35:57 -0400 Original-Received: from cantor2.suse.de ([195.135.220.15]:35796 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdG01-0004cs-VK; Wed, 01 Apr 2015 06:35:54 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Original-Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 6E626ABA2; Wed, 1 Apr 2015 10:35:52 +0000 (UTC) X-Yow: I'm MENTALLY here.. but PHYSICALLY I'm purchasing NAUGAHYDE furniture in the' SUBURBS of PHOENIX!! In-Reply-To: (Richard Stallman's message of "Wed, 01 Apr 2015 06:22:15 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (no timestamps) [generic] X-Received-From: 195.135.220.15 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:184704 Archived-At: Richard Stallman writes: > 2. With CVS, merge conflicts are easy to handle -- just edit the file, > look for the <<< and >>> that indicate conflicts, and fix up each one. And if you did something wrong you are lost. No way to redo the merge. > Can I do it that way in Git? Yes, only much better. If the merge went wrong in some way, just redo it. Andreas. -- Andreas Schwab, SUSE Labs, schwab@suse.de GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."