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 19:00:50 +0300 Message-ID: <83twwzrg7h.fsf@gnu.org> 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> <86a8yrc0r1.fsf@dod.no> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1427904121 11222 80.91.229.3 (1 Apr 2015 16:02:01 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 1 Apr 2015 16:02:01 +0000 (UTC) Cc: emacs-devel@gnu.org To: Steinar Bang Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 01 18:01:54 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 1YdL5L-00085u-EJ for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 18:01:43 +0200 Original-Received: from localhost ([::1]:53731 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdL5K-0008Ou-O7 for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 12:01:42 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34627) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdL5G-0008LS-4H for emacs-devel@gnu.org; Wed, 01 Apr 2015 12:01:38 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdL5D-0002OE-0F for emacs-devel@gnu.org; Wed, 01 Apr 2015 12:01:38 -0400 Original-Received: from mtaout27.012.net.il ([80.179.55.183]:46999) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdL5C-0002Nq-Po for emacs-devel@gnu.org; Wed, 01 Apr 2015 12:01:34 -0400 Original-Received: from conversion-daemon.mtaout27.012.net.il by mtaout27.012.net.il (HyperSendmail v2007.08) id <0NM400700XJ2A300@mtaout27.012.net.il> for emacs-devel@gnu.org; Wed, 01 Apr 2015 18:55:48 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout27.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NM400012XL0GD60@mtaout27.012.net.il>; Wed, 01 Apr 2015 18:55:48 +0300 (IDT) In-reply-to: <86a8yrc0r1.fsf@dod.no> 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.183 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:184738 Archived-At: > From: Steinar Bang > Date: Wed, 01 Apr 2015 17:43:46 +0200 > > > 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. > > Can I do it that way in Git? > > As Eli says: yes > > 1. Edit the file, search for the conflict markers and fix them > 2. git add name-of-conflicted-file ("git add ChangeLog" in your case) This 2nd item should be done automatically by VC when you save a file whose conflicts were resolved. > 3. git commit