From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Wed, 01 Apr 2015 06:22:19 -0400 Message-ID: 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: rms@gnu.org NNTP-Posting-Host: plane.gmane.org Content-Type: text/plain; charset=Utf-8 X-Trace: ger.gmane.org 1427883783 1696 80.91.229.3 (1 Apr 2015 10:23:03 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 1 Apr 2015 10:23:03 +0000 (UTC) Cc: sva-news@mygooglest.com, emacs-devel@gnu.org, dgutov@yandex.ru To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Apr 01 12:22:56 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 1YdFn7-0004Dm-Jq for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 12:22:33 +0200 Original-Received: from localhost ([::1]:49612 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdFn6-0002ep-RQ for ged-emacs-devel@m.gmane.org; Wed, 01 Apr 2015 06:22:32 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43377) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdFmv-0002Pj-7c for emacs-devel@gnu.org; Wed, 01 Apr 2015 06:22:22 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdFmu-00049g-Dq for emacs-devel@gnu.org; Wed, 01 Apr 2015 06:22:21 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:53426) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdFmu-00049a-Bl for emacs-devel@gnu.org; Wed, 01 Apr 2015 06:22:20 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1YdFmt-0007uD-Cp; Wed, 01 Apr 2015 06:22:19 -0400 In-reply-to: <834mp1tf0j.fsf@gnu.org> (message from Eli Zaretskii on Tue, 31 Mar 2015 17:31:24 +0300) X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::e 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:184702 Archived-At: [[[ To any NSA and FBI agents reading my email: please consider ]]] [[[ whether defending the US Constitution against all enemies, ]]] [[[ foreign or domestic, requires you to follow Snowden's example. ]]] > > Neither is exactly true. Since 1.7.0 or so, "git pull" with uncommitted > > changes can succeed if the newly pulled changes don't touch the locally > > changed files, but will fail otherwise. Which makes a lot of sense. > Yes, and is expected. Even CVS did that ;-) 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. It seems that git handles this much worse. -- Dr Richard Stallman President, Free Software Foundation 51 Franklin St Boston MA 02110 USA www.fsf.org www.gnu.org Skype: No way! See stallman.org/skype.html.