From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: After a git merge and manual correction of a conflict, how do I tell git the conflict is fixed? Date: Wed, 27 May 2015 05:02:09 +0300 Message-ID: <556525A1.10802@yandex.ru> References: <20150526223928.GA4675@acm.fritz.box> <55651004.40809@yandex.ru> <55651221.1060603@yandex.ru> <5565162C.2090307@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1432692236 28026 80.91.229.3 (27 May 2015 02:03:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 May 2015 02:03:56 +0000 (UTC) Cc: Emacs development discussions To: Kelvin White , bruce.connor.am@gmail.com, Alan Mackenzie Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed May 27 04:03:44 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 1YxQh6-00081W-98 for ged-emacs-devel@m.gmane.org; Wed, 27 May 2015 04:03:44 +0200 Original-Received: from localhost ([::1]:50986 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxQh5-0002RZ-IS for ged-emacs-devel@m.gmane.org; Tue, 26 May 2015 22:03:43 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45885) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxQgt-0002RO-5U for emacs-devel@gnu.org; Tue, 26 May 2015 22:03:32 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxQgp-0005ao-Up for emacs-devel@gnu.org; Tue, 26 May 2015 22:03:31 -0400 Original-Received: from mail-wi0-x233.google.com ([2a00:1450:400c:c05::233]:35651) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxQgp-000552-NX; Tue, 26 May 2015 22:03:27 -0400 Original-Received: by wicmx19 with SMTP id mx19so95393329wic.0; Tue, 26 May 2015 19:02:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:cc:from:message-id:date:user-agent :mime-version:in-reply-to:content-type:content-transfer-encoding; bh=+fbh408b11m9zexW6qRLYyxptbTMOg+5J7FM4vbvPuQ=; b=wV3sfeV8wEXdiTrPJ9vJyShAhgD5Uk9C8NIX0gM04skUqlcCeBTrdnkEyW6Fnt+wJX k62dT2eCSAofrf5ozDAgaMV82ill52LD4rGQVh+UH5vTxG1jY8wd2Ycy0Cnl/z/x9bnW OeEg7+D2s9IG8Nna9IAXBkitY8WrPN3qze9eUfruif5hkpwAmf9a5CkSYmbU6v/6VKL7 52vgrNrd33AvZvpayceCb/tt+YBPzPFmBM6WnHWy6iqnzYfulnhu2jlUEO9K24zEh2wF nhZOn9yUghPCgYNZE3+6L6UZUD0na3qfAUK8gQC/y2uFo9ptrZrhaDl1Lhr0OHZAoXmN b3DA== X-Received: by 10.194.91.176 with SMTP id cf16mr53167839wjb.141.1432692131399; Tue, 26 May 2015 19:02:11 -0700 (PDT) Original-Received: from [192.168.1.2] ([82.102.93.54]) by mx.google.com with ESMTPSA id gh3sm17219534wjb.36.2015.05.26.19.02.10 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 May 2015 19:02:11 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.0 In-Reply-To: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:400c:c05::233 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:186852 Archived-At: On 05/27/2015 04:57 AM, Kelvin White wrote: > Maybe this can clarify my point better. > > http://stackoverflow.com/questions/5798930/git-rm-cached-x-vs-git-reset-head-x This is the last sentence in the top answer: """ A commit now will sync the index and tree and the file will be removed. """