From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.devel Subject: Re: VC mode and git Date: Sat, 04 Apr 2015 18:09:58 +0200 Organization: Probably a good idea Message-ID: <86mw2n98o9.fsf@dod.no> 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1428163813 30311 80.91.229.3 (4 Apr 2015 16:10:13 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 4 Apr 2015 16:10:13 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 04 18:10:04 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 1YeQe4-00056f-5g for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 18:10:04 +0200 Original-Received: from localhost ([::1]:33644 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeQe3-0000Jm-1Y for ged-emacs-devel@m.gmane.org; Sat, 04 Apr 2015 12:10:03 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45933) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeQdq-0000Il-6X for emacs-devel@gnu.org; Sat, 04 Apr 2015 12:09:51 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YeQdm-0003mI-6L for emacs-devel@gnu.org; Sat, 04 Apr 2015 12:09:50 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:52422) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YeQdm-0003lw-03 for emacs-devel@gnu.org; Sat, 04 Apr 2015 12:09:46 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YeQdi-0004ry-VD for emacs-devel@gnu.org; Sat, 04 Apr 2015 18:09:43 +0200 Original-Received: from cm-84.208.248.210.getinternet.no ([84.208.248.210]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 04 Apr 2015 18:09:42 +0200 Original-Received: from sb by cm-84.208.248.210.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 04 Apr 2015 18:09:42 +0200 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 24 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.208.248.210.getinternet.no Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/24.4 (windows-nt) Cancel-Lock: sha1:c0ni9nvdI/Bq2QJSu4Xsi4V79Us= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 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:184876 Archived-At: >>>>> Eli Zaretskii : > I think it will succeed in fetching, and then refuse to merge. Correct. > But the way to handle this is the same as if the conflicted changes > are committed: fix the conflicts, and then "git pull" again. Right? No, that won't work: since the merge hasn't happened, there will be no conflicts, just the uncommitted changes. 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, at least nothing to put in a simple workflow)