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: Sun, 05 Apr 2015 05:10:12 -0400 Message-ID: References: <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> <83bnj7syd5.fsf@gnu.org> <87y4mbhnw1.fsf@gmail.com> <83wq1vrgbk.fsf@gnu.org> <87sicjggj6.fsf@gmail.com> <83ego2r2vc.fsf@gnu.org> <86bnj59rjj.fsf@dod.no> <83wq1snd0k.fsf@gnu.org> <86vbhb9auh.fsf@dod.no> <83sicfoqtp.fsf@gnu.org> <86mw2n98o9.fsf@dod.no> Reply-To: rms@gnu.org NNTP-Posting-Host: plane.gmane.org Content-Type: text/plain; charset=Utf-8 X-Trace: ger.gmane.org 1428225050 6061 80.91.229.3 (5 Apr 2015 09:10:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 5 Apr 2015 09:10:50 +0000 (UTC) Cc: emacs-devel@gnu.org To: Steinar Bang Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Apr 05 11:10:43 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 1YegZm-00046r-EW for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 11:10:42 +0200 Original-Received: from localhost ([::1]:35621 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YegZl-0004ea-Gl for ged-emacs-devel@m.gmane.org; Sun, 05 Apr 2015 05:10:41 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60242) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YegZK-0004e9-5L for emacs-devel@gnu.org; Sun, 05 Apr 2015 05:10:15 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YegZJ-0002L7-F0 for emacs-devel@gnu.org; Sun, 05 Apr 2015 05:10:14 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:51826) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YegZJ-0002L3-Ci for emacs-devel@gnu.org; Sun, 05 Apr 2015 05:10:13 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1YegZI-0006vB-FY; Sun, 05 Apr 2015 05:10:12 -0400 In-reply-to: <86mw2n98o9.fsf@dod.no> (message from Steinar Bang on Sat, 04 Apr 2015 18:09:58 +0200) 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:184906 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. ]]] > The only way to make git do the merge is to move away the uncommitted > changes, either by committing them, or by stashing them. > So to get out of the unpullable situation one either have to keep > committing changesets (and try a pull), or do > git stash > git pull > git stash pop > (unfortunately the "git stash pop" may also have a conflict, and getting > out of fixing the conflict without committing, is sort-of-advanced git, I am not sure what the last sentence means. Suppose git stash pop reports a conflict. Suppose I am willing to fix the conflict right then, but I don't want to commit all those changes now (because some should not be installed). Is that straightforward to do? If so, how? -- 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.